diff --git a/requirements.txt b/requirements.txt
index 1790a0216..085d5a147 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ sh==1.12.14
 binaryornot==0.4.4
 
 # Testing
-pytest==3.3.2
+pytest==3.4.1
 pycodestyle==2.3.1
 pyflakes==1.6.0
 tox==2.9.1
diff --git a/tests/test_docker.sh b/tests/test_docker.sh
index 137694d7a..d80a091e4 100755
--- a/tests/test_docker.sh
+++ b/tests/test_docker.sh
@@ -19,3 +19,6 @@ docker-compose -f local.yml run django python manage.py test
 
 # return non-zero status code if there are migrations that have not been created
 docker-compose -f local.yml run django python manage.py makemigrations --dry-run --check || { echo "ERROR: there were changes in the models, but migration listed above have not been created and are not saved in version control"; exit 1; }
+
+# Test support for translations
+docker-compose -f local.yml run --rm django python manage.py makemessages
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index b9ee34b76..383b15776 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -1,7 +1,18 @@
-FROM python:3.6
+FROM python:3.6-alpine
 
 ENV PYTHONUNBUFFERED 1
 
+RUN apk update \
+  # psycopg2 dependencies
+  && apk add --virtual build-deps gcc python3-dev musl-dev \
+  && apk add postgresql-dev \
+  # Pillow dependencies
+  && apk add jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev \
+  # CFFI dependencies
+  && apk add libffi-dev openssl-dev py-cffi \
+  # Translations dependencies
+  && apk add gettext
+
 # Requirements have to be pulled and installed here, otherwise caching won't work
 COPY ./requirements /requirements
 RUN pip install -r /requirements/local.txt
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start.sh b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start.sh
index c26318b44..0ca8bb507 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start.sh
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 set -o errexit
 set -o pipefail
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start.sh b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start.sh
index 8b50c8cfd..4335340de 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start.sh
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 set -o errexit
 set -o pipefail
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start.sh b/{{cookiecutter.project_slug}}/compose/local/django/start.sh
index cf4a41667..50227e19e 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/start.sh
+++ b/{{cookiecutter.project_slug}}/compose/local/django/start.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 set -o errexit
 set -o pipefail
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 48923c80b..2ded8253e 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -1,9 +1,18 @@
-FROM python:3.6
+FROM python:3.6-alpine
 
 ENV PYTHONUNBUFFERED 1
 
-RUN groupadd -r django \
-    && useradd -r -g django django
+RUN apk update \
+  # psycopg2 dependencies
+  && apk add --virtual build-deps gcc python3-dev musl-dev \
+  && apk add postgresql-dev \
+  # Pillow dependencies
+  && apk add jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev \
+  # CFFI dependencies
+  && apk add libffi-dev openssl-dev py-cffi
+
+RUN addgroup -S django \
+    && adduser -S -G django django
 
 # Requirements have to be pulled and installed here, otherwise caching won't work
 COPY ./requirements /requirements
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start.sh b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start.sh
index 845db0a3d..def83076c 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start.sh
+++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 set -o errexit
 set -o pipefail
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/worker/start.sh b/{{cookiecutter.project_slug}}/compose/production/django/celery/worker/start.sh
index 4529aad92..10f0d20c5 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/celery/worker/start.sh
+++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/worker/start.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 set -o errexit
 set -o pipefail
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh
index 3b83c7bb6..a40a2b7e4 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh
+++ b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 set -o errexit
 set -o pipefail
@@ -25,7 +25,7 @@ export DATABASE_URL=postgres://$POSTGRES_USER:$POSTGRES_PASSWORD@postgres:5432/$
 export CELERY_BROKER_URL=$REDIS_URL/0
 {% endif %}
 
-function postgres_ready(){
+postgres_ready() {
 python << END
 import sys
 import psycopg2
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/gunicorn.sh b/{{cookiecutter.project_slug}}/compose/production/django/gunicorn.sh
index 25da06496..8846cafb2 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/gunicorn.sh
+++ b/{{cookiecutter.project_slug}}/compose/production/django/gunicorn.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 set -o errexit
 set -o pipefail
diff --git a/{{cookiecutter.project_slug}}/locale/README.rst b/{{cookiecutter.project_slug}}/locale/README.rst
new file mode 100644
index 000000000..c2f1dcd6f
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/locale/README.rst
@@ -0,0 +1,6 @@
+Translations
+============
+
+Translations will be placed in this folder when running::
+
+    python manage.py makemessages
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 697a40288..6004987d2 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -5,7 +5,7 @@ coverage==4.5.1
 django-coverage-plugin==1.5.0
 
 Sphinx==1.7.0
-django-extensions==1.9.9
+django-extensions==2.0.0
 Werkzeug==0.14.1
 django-test-plus==1.0.22
 factory-boy==2.10.0