diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index e46c5209..08bca907 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -53,6 +53,7 @@ Listed in alphabetical order.
   Andy Rose
   Anna Callahan            `@jazztpt`_
   Antonia Blair            `@antoniablair`_             @antoniablairart
+  Arcuri Davide            `@dadokkio`_
   Areski Belaid            `@areski`_
   Ashley Camba
   Barclay Gauld            `@yunti`_
@@ -67,6 +68,7 @@ Listed in alphabetical order.
   Burhan Khalid            `@burhan`_                   @burhan
   Catherine Devlin         `@catherinedevlin`_
   Cédric Gaspoz            `@cgaspoz`_
+  Charlie Smith            `@chuckus`_
   Chris Curvey             `@ccurvey`_
   Chris Franklin
   Chris Franklin           `@hairychris`_
@@ -127,6 +129,7 @@ Listed in alphabetical order.
   Peter Bittner            `@bittner`_
   Raphael Pierzina         `@hackebrot`_
   Raony Guimarães Corrêa   `@raonyguimaraes`_
+  Reggie Riser             `@reggieriser`_
   René Muhl                `@rm--`_
   Roman Afanaskin          `@siauPatrick`_
   Roman Osipenko           `@romanosipenko`_
@@ -177,6 +180,7 @@ Listed in alphabetical order.
 .. _@cgaspoz: https://github.com/cgaspoz
 .. _@chrisdev: https://github.com/chrisdev
 .. _@ChrisPappalardo: https://github.com/ChrisPappalardo
+.. _@chuckus: https://github.com/chuckus
 .. _@Collederas: https://github.com/Collederas
 .. _@ddiazpinto: https://github.com/ddiazpinto
 .. _@dezoito: https://github.com/dezoito
@@ -219,6 +223,7 @@ Listed in alphabetical order.
 .. _@oubiga: https://github.com/oubiga
 .. _@parbhat: https://github.com/parbhat
 .. _@raonyguimaraes: https://github.com/raonyguimaraes
+.. _@reggieriser: https://github.com/reggieriser
 .. _@rm--: https://github.com/rm--
 .. _@romanosipenko: https://github.com/romanosipenko
 .. _@shireenrao: https://github.com/shireenrao
diff --git a/README.rst b/README.rst
index 2b239f78..23cc2672 100644
--- a/README.rst
+++ b/README.rst
@@ -12,13 +12,16 @@ Cookiecutter Django
 .. image:: https://badges.gitter.im/Join Chat.svg
     :target: https://gitter.im/pydanny/cookiecutter-django?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
 
-Powered by Cookiecutter_, Cookiecutter Django is a framework for jumpstarting production-ready Django projects quickly.
+Powered by Cookiecutter_, Cookiecutter Django is a framework for jumpstarting
+production-ready Django projects quickly.
 
 * Documentation: https://cookiecutter-django.readthedocs.io/en/latest/
 * See Troubleshooting_ for common errors and obstacles
-* If you have problems with Cookiecutter Django, please open issues_ don't send emails to the maintainers.
-* Need quick professional paid support? Contact `support@cookiecutter.io`_. This includes configuring your servers,
-fixing bugs, reviewing your code and everything in between.
+* If you have problems with Cookiecutter Django, please open issues_ don't send
+  emails to the maintainers.
+* Need quick professional paid support? Contact `support@cookiecutter.io`_.
+  This includes configuring your servers, fixing bugs, reviewing your code and
+  everything in between.
 
 .. _cookiecutter: https://github.com/audreyr/cookiecutter
 
@@ -34,7 +37,7 @@ Features
 * For Django 1.10
 * Works with Python 3.4.x or 3.5.x. Python 3.6 is experimental
 * Renders Django projects with 100% starting test coverage
-* Twitter Bootstrap_ v4.0.0 - alpha 6 (`maintained Foundation fork`_ also available)
+* Twitter Bootstrap_ v4.0.0 - beta 1 (`maintained Foundation fork`_ also available)
 * 12-Factor_ based settings via django-environ_
 * Secure by default. We believe in SSL.
 * Optimized development and production settings
diff --git a/docs/linters.rst b/docs/linters.rst
index 4750e161..feb59d03 100644
--- a/docs/linters.rst
+++ b/docs/linters.rst
@@ -30,14 +30,14 @@ The config for pylint is located in .pylintrc. It specifies:
 * Disable linting messages for missing docstring and invalid name
 * max-parents=13
 
-pep8
+pycodestyle
 -----
 
 This is included in flake8's checks, but you can also run it separately to see a more detailed report:
 
-    $ pep8 <python files that you wish to lint>
+    $ pycodestyle <python files that you wish to lint>
 
-The config for pep8 is located in setup.cfg. It specifies:
+The config for pycodestyle is located in setup.cfg. It specifies:
 
 * Set max line length to 120 chars
 * Exclude ``.tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules``
diff --git a/requirements.txt b/requirements.txt
index b87473c1..90064660 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,8 +4,8 @@ sh==1.12.14
 binaryornot==0.4.4
 
 # Testing
-pytest==3.2.1
-pep8==1.7.0
+pytest==3.2.3
+pycodestyle==2.3.1
 pyflakes==1.6.0
-tox==2.7.0
+tox==2.9.1
 pytest-cookies==0.2.0
diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore
index 70795664..65feea00 100644
--- a/{{cookiecutter.project_slug}}/.gitignore
+++ b/{{cookiecutter.project_slug}}/.gitignore
@@ -361,3 +361,9 @@ mailhog
 {% endif %}
 
 {{ cookiecutter.project_slug }}/media/
+
+{% if cookiecutter.use_docker == 'y' -%}
+# Added to maintain local compose files which are ignored by something above.
+# See issue https://github.com/pydanny/cookiecutter-django/issues/1321
+!/compose/local/
+{% endif %}
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__migrate.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__migrate.xml
index 98fff92e..95f45bfb 100644
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__migrate.xml
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__migrate.xml
@@ -6,7 +6,7 @@
       <env name="PYTHONUNBUFFERED" value="1" />
       <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
     </envs>
-    <option name="SDK_HOME" value="docker-compose://[$PROJECT_DIR$/dev.yml]:pycharm/python" />
+    <option name="SDK_HOME" value="docker-compose://[$PROJECT_DIR$/local.yml]:pycharm/python" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__runserver.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__runserver.xml
index 070f6403..77b9a587 100644
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__runserver.xml
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__runserver.xml
@@ -6,7 +6,7 @@
       <env name="PYTHONUNBUFFERED" value="1" />
       <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
     </envs>
-    <option name="SDK_HOME" value="docker-compose://[$PROJECT_DIR$/dev.yml]:django/python" />
+    <option name="SDK_HOME" value="docker-compose://[$PROJECT_DIR$/local.yml]:django/python" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__runserver_plus.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__runserver_plus.xml
index ce9ee8cc..07bbe40c 100644
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__runserver_plus.xml
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__runserver_plus.xml
@@ -6,7 +6,7 @@
       <env name="PYTHONUNBUFFERED" value="1" />
       <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
     </envs>
-    <option name="SDK_HOME" value="docker-compose://[$PROJECT_DIR$/dev.yml]:django/python" />
+    <option name="SDK_HOME" value="docker-compose://[$PROJECT_DIR$/local.yml]:django/python" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___all.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___all.xml
index e654a2ba..5c797c61 100644
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___all.xml
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___all.xml
@@ -6,7 +6,7 @@
       <env name="PYTHONUNBUFFERED" value="1" />
       <env name="DJANGO_SETTINGS_MODULE" value="config.settings.test" />
     </envs>
-    <option name="SDK_HOME" value="docker-compose://[$PROJECT_DIR$/dev.yml]:pycharm/python" />
+    <option name="SDK_HOME" value="docker-compose://[$PROJECT_DIR$/local.yml]:pycharm/python" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___class__TestUser.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___class__TestUser.xml
index ecc680a8..f2b046b9 100644
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___class__TestUser.xml
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___class__TestUser.xml
@@ -6,7 +6,7 @@
       <env name="PYTHONUNBUFFERED" value="1" />
       <env name="DJANGO_SETTINGS_MODULE" value="config.settings.test" />
     </envs>
-    <option name="SDK_HOME" value="docker-compose://[$PROJECT_DIR$/dev.yml]:pycharm/python" />
+    <option name="SDK_HOME" value="docker-compose://[$PROJECT_DIR$/local.yml]:pycharm/python" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___file__test_models.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___file__test_models.xml
index 902cad84..2dba2624 100644
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___file__test_models.xml
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___file__test_models.xml
@@ -6,7 +6,7 @@
       <env name="PYTHONUNBUFFERED" value="1" />
       <env name="DJANGO_SETTINGS_MODULE" value="config.settings.test" />
     </envs>
-    <option name="SDK_HOME" value="docker-compose://[$PROJECT_DIR$/dev.yml]:pycharm/python" />
+    <option name="SDK_HOME" value="docker-compose://[$PROJECT_DIR$/local.yml]:pycharm/python" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___module__users.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___module__users.xml
index 419cc09b..6ab0709f 100644
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___module__users.xml
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___module__users.xml
@@ -6,7 +6,7 @@
       <env name="PYTHONUNBUFFERED" value="1" />
       <env name="DJANGO_SETTINGS_MODULE" value="config.settings.test" />
     </envs>
-    <option name="SDK_HOME" value="docker-compose://[$PROJECT_DIR$/dev.yml]:pycharm/python" />
+    <option name="SDK_HOME" value="docker-compose://[$PROJECT_DIR$/local.yml]:pycharm/python" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___specific__test_get_absolute_url.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___specific__test_get_absolute_url.xml
index 099f0fb4..5dba01f0 100644
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___specific__test_get_absolute_url.xml
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___specific__test_get_absolute_url.xml
@@ -6,7 +6,7 @@
       <env name="PYTHONUNBUFFERED" value="1" />
       <env name="DJANGO_SETTINGS_MODULE" value="config.settings.test" />
     </envs>
-    <option name="SDK_HOME" value="docker-compose://[$PROJECT_DIR$/dev.yml]:pycharm/python" />
+    <option name="SDK_HOME" value="docker-compose://[$PROJECT_DIR$/local.yml]:pycharm/python" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
diff --git a/{{cookiecutter.project_slug}}/compose/caddy/Dockerfile b/{{cookiecutter.project_slug}}/compose/caddy/Dockerfile
deleted file mode 100644
index 774b0bf5..00000000
--- a/{{cookiecutter.project_slug}}/compose/caddy/Dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM abiosoft/caddy:0.10.6
-COPY Caddyfile /etc/Caddyfile
diff --git a/{{cookiecutter.project_slug}}/compose/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/django/Dockerfile
deleted file mode 100644
index 618533f7..00000000
--- a/{{cookiecutter.project_slug}}/compose/django/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM python:3.5
-
-ENV PYTHONUNBUFFERED 1
-
-RUN groupadd -r django \
-    && useradd -r -g django django
-
-# Requirements have to be pulled and installed here, otherwise caching won't work
-COPY ./requirements /requirements
-RUN pip install --no-cache-dir -r /requirements/production.txt \
-    && rm -rf /requirements
-
-COPY ./compose/django/gunicorn.sh ./compose/django/entrypoint.sh /
-RUN sed -i 's/\r//' /entrypoint.sh \
-    && sed -i 's/\r//' /gunicorn.sh \
-    && chmod +x /entrypoint.sh \
-    && chown django /entrypoint.sh \
-    && chmod +x /gunicorn.sh \
-    && chown django /gunicorn.sh
-
-COPY . /app
-
-RUN chown -R django /app
-
-USER django
-
-WORKDIR /app
-
-ENTRYPOINT ["/entrypoint.sh"]
diff --git a/{{cookiecutter.project_slug}}/compose/django/Dockerfile-local b/{{cookiecutter.project_slug}}/compose/django/Dockerfile-local
deleted file mode 100644
index d2c56532..00000000
--- a/{{cookiecutter.project_slug}}/compose/django/Dockerfile-local
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM python:3.5
-ENV PYTHONUNBUFFERED 1
-
-# Requirements have to be pulled and installed here, otherwise caching won't work
-COPY ./requirements /requirements
-RUN pip install -r /requirements/local.txt
-
-COPY ./compose/django/entrypoint.sh /entrypoint.sh
-RUN sed -i 's/\r//' /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-
-COPY ./compose/django/start-dev.sh /start-dev.sh
-RUN sed -i 's/\r//' /start-dev.sh
-RUN chmod +x /start-dev.sh
-
-COPY ./compose/django/celery/worker/start-dev.sh /start-celeryworker-dev.sh
-RUN sed -i 's/\r//' /start-celeryworker-dev.sh
-RUN chmod +x /start-celeryworker-dev.sh
-
-COPY ./compose/django/celery/beat/start-dev.sh /start-celerybeat-dev.sh
-RUN sed -i 's/\r//' /start-celerybeat-dev.sh
-RUN chmod +x /start-celerybeat-dev.sh
-
-WORKDIR /app
-
-ENTRYPOINT ["/entrypoint.sh"]
diff --git a/{{cookiecutter.project_slug}}/compose/django/start-dev.sh b/{{cookiecutter.project_slug}}/compose/django/start-dev.sh
deleted file mode 100644
index 04e06981..00000000
--- a/{{cookiecutter.project_slug}}/compose/django/start-dev.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-python manage.py migrate
-python manage.py runserver_plus 0.0.0.0:8000
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
new file mode 100644
index 00000000..e62b524a
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -0,0 +1,27 @@
+FROM python:3.5
+
+ENV PYTHONUNBUFFERED 1
+
+# Requirements have to be pulled and installed here, otherwise caching won't work
+COPY ./requirements /requirements
+RUN pip install -r /requirements/local.txt
+
+COPY ./compose/production/django/entrypoint.sh /entrypoint.sh
+RUN sed -i 's/\r//' /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+COPY ./compose/local/django/start.sh /start.sh
+RUN sed -i 's/\r//' /start.sh
+RUN chmod +x /start.sh
+
+COPY ./compose/local/django/celery/worker/start.sh /start-celeryworker.sh
+RUN sed -i 's/\r//' /start-celeryworker.sh
+RUN chmod +x /start-celeryworker.sh
+
+COPY ./compose/local/django/celery/beat/start.sh /start-celerybeat.sh
+RUN sed -i 's/\r//' /start-celerybeat.sh
+RUN chmod +x /start-celerybeat.sh
+
+WORKDIR /app
+
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/{{cookiecutter.project_slug}}/compose/django/celery/beat/start-dev.sh b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start.sh
similarity index 78%
rename from {{cookiecutter.project_slug}}/compose/django/celery/beat/start-dev.sh
rename to {{cookiecutter.project_slug}}/compose/local/django/celery/beat/start.sh
index 987d7259..c26318b4 100644
--- a/{{cookiecutter.project_slug}}/compose/django/celery/beat/start-dev.sh
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start.sh
@@ -1,8 +1,10 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -o errexit
+set -o pipefail
 set -o nounset
 set -o xtrace
 
+
 rm -f './celerybeat.pid'
 celery -A {{cookiecutter.project_slug}}.taskapp beat -l INFO
diff --git a/{{cookiecutter.project_slug}}/compose/django/celery/worker/start-dev.sh b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start.sh
similarity index 74%
rename from {{cookiecutter.project_slug}}/compose/django/celery/worker/start-dev.sh
rename to {{cookiecutter.project_slug}}/compose/local/django/celery/worker/start.sh
index 594065e6..8b50c8cf 100644
--- a/{{cookiecutter.project_slug}}/compose/django/celery/worker/start-dev.sh
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start.sh
@@ -1,7 +1,9 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -o errexit
+set -o pipefail
 set -o nounset
 set -o xtrace
 
+
 celery -A {{cookiecutter.project_slug}}.taskapp worker -l INFO
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start.sh b/{{cookiecutter.project_slug}}/compose/local/django/start.sh
new file mode 100644
index 00000000..cf4a4166
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/local/django/start.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o pipefail
+set -o nounset
+set -o xtrace
+
+
+python manage.py migrate
+python manage.py runserver_plus 0.0.0.0:8000
diff --git a/{{cookiecutter.project_slug}}/compose/postgres/Dockerfile b/{{cookiecutter.project_slug}}/compose/postgres/Dockerfile
deleted file mode 100644
index 9cdaaba3..00000000
--- a/{{cookiecutter.project_slug}}/compose/postgres/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM postgres:{{ cookiecutter.postgresql_version }}
-
-# add backup scripts
-ADD backup.sh /usr/local/bin/backup
-ADD restore.sh /usr/local/bin/restore
-ADD list-backups.sh /usr/local/bin/list-backups
-
-# make them executable
-RUN chmod +x /usr/local/bin/restore
-RUN chmod +x /usr/local/bin/list-backups
-RUN chmod +x /usr/local/bin/backup
diff --git a/{{cookiecutter.project_slug}}/compose/caddy/Caddyfile b/{{cookiecutter.project_slug}}/compose/production/caddy/Caddyfile
similarity index 75%
rename from {{cookiecutter.project_slug}}/compose/caddy/Caddyfile
rename to {{cookiecutter.project_slug}}/compose/production/caddy/Caddyfile
index 22ec73f4..d36632e4 100644
--- a/{{cookiecutter.project_slug}}/compose/caddy/Caddyfile
+++ b/{{cookiecutter.project_slug}}/compose/production/caddy/Caddyfile
@@ -1,8 +1,8 @@
-www.{% raw %}{%DOMAIN_NAME%}{% endraw %} {
+www.{% raw %}{$DOMAIN_NAME}{% endraw %} {
     redir https://{{cookiecutter.domain_name}}
 }
 
-{% raw %}{%DOMAIN_NAME%}{% endraw %} {
+{% raw %}{$DOMAIN_NAME}{% endraw %} {
     proxy / django:5000 {
         header_upstream Host {host}
         header_upstream X-Real-IP {remote}
diff --git a/{{cookiecutter.project_slug}}/compose/production/caddy/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/caddy/Dockerfile
new file mode 100644
index 00000000..d02f0342
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/production/caddy/Dockerfile
@@ -0,0 +1,3 @@
+FROM abiosoft/caddy:0.10.6
+
+COPY ./compose/production/caddy/Caddyfile /etc/Caddyfile
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
new file mode 100644
index 00000000..fcbe5184
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -0,0 +1,39 @@
+FROM python:3.5
+
+ENV PYTHONUNBUFFERED 1
+
+RUN groupadd -r django \
+    && useradd -r -g django django
+
+# Requirements have to be pulled and installed here, otherwise caching won't work
+COPY ./requirements /requirements
+RUN pip install --no-cache-dir -r /requirements/production.txt \
+    && rm -rf /requirements
+
+COPY ./compose/production/django/gunicorn.sh /gunicorn.sh
+RUN sed -i 's/\r//' /gunicorn.sh
+RUN chmod +x /gunicorn.sh
+RUN chown django /gunicorn.sh
+
+COPY ./compose/production/django/entrypoint.sh /entrypoint.sh
+RUN sed -i 's/\r//' /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+RUN chown django /entrypoint.sh
+
+COPY ./compose/production/django/celery/worker/start.sh /start-celeryworker.sh
+RUN sed -i 's/\r//' /start-celeryworker.sh
+RUN chmod +x /start-celeryworker.sh
+
+COPY ./compose/production/django/celery/beat/start.sh /start-celerybeat.sh
+RUN sed -i 's/\r//' /start-celerybeat.sh
+RUN chmod +x /start-celerybeat.sh
+
+COPY . /app
+
+RUN chown -R django /app
+
+USER django
+
+WORKDIR /app
+
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start.sh b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start.sh
new file mode 100644
index 00000000..845db0a3
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o pipefail
+set -o nounset
+
+
+celery -A {{cookiecutter.project_slug}}.taskapp beat -l INFO
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/worker/start.sh b/{{cookiecutter.project_slug}}/compose/production/django/celery/worker/start.sh
new file mode 100644
index 00000000..4529aad9
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/worker/start.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o pipefail
+set -o nounset
+
+
+celery -A {{cookiecutter.project_slug}}.taskapp worker -l INFO
diff --git a/{{cookiecutter.project_slug}}/compose/django/entrypoint.sh b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh
similarity index 91%
rename from {{cookiecutter.project_slug}}/compose/django/entrypoint.sh
rename to {{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh
index 9fe7f5c8..3b83c7bb 100644
--- a/{{cookiecutter.project_slug}}/compose/django/entrypoint.sh
+++ b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh
@@ -1,5 +1,12 @@
-#!/bin/bash
-set -e
+#!/usr/bin/env bash
+
+set -o errexit
+set -o pipefail
+
+# todo: turn on after #1295
+# set -o nounset
+
+
 cmd="$@"
 
 # This entrypoint is used to play nicely with the current cookiecutter configuration.
diff --git a/{{cookiecutter.project_slug}}/compose/django/gunicorn.sh b/{{cookiecutter.project_slug}}/compose/production/django/gunicorn.sh
similarity index 59%
rename from {{cookiecutter.project_slug}}/compose/django/gunicorn.sh
rename to {{cookiecutter.project_slug}}/compose/production/django/gunicorn.sh
index 014f173e..25da0649 100644
--- a/{{cookiecutter.project_slug}}/compose/django/gunicorn.sh
+++ b/{{cookiecutter.project_slug}}/compose/production/django/gunicorn.sh
@@ -1,3 +1,9 @@
-#!/bin/sh
+#!/usr/bin/env bash
+
+set -o errexit
+set -o pipefail
+set -o nounset
+
+
 python /app/manage.py collectstatic --noinput
-/usr/local/bin/gunicorn config.wsgi -w 4 -b 0.0.0.0:5000 --chdir=/app
\ No newline at end of file
+/usr/local/bin/gunicorn config.wsgi -w 4 -b 0.0.0.0:5000 --chdir=/app
diff --git a/{{cookiecutter.project_slug}}/compose/production/postgres/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/postgres/Dockerfile
new file mode 100644
index 00000000..84164d0b
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/production/postgres/Dockerfile
@@ -0,0 +1,10 @@
+FROM postgres:{{ cookiecutter.postgresql_version }}
+
+COPY ./compose/production/postgres/backup.sh /usr/local/bin/backup
+RUN chmod +x /usr/local/bin/backup
+
+COPY ./compose/production/postgres/restore.sh /usr/local/bin/restore
+RUN chmod +x /usr/local/bin/restore
+
+COPY ./compose/production/postgres/list-backups.sh /usr/local/bin/list-backups
+RUN chmod +x /usr/local/bin/list-backups
diff --git a/{{cookiecutter.project_slug}}/compose/postgres/backup.sh b/{{cookiecutter.project_slug}}/compose/production/postgres/backup.sh
similarity index 90%
rename from {{cookiecutter.project_slug}}/compose/postgres/backup.sh
rename to {{cookiecutter.project_slug}}/compose/production/postgres/backup.sh
index 47f7a514..46438011 100644
--- a/{{cookiecutter.project_slug}}/compose/postgres/backup.sh
+++ b/{{cookiecutter.project_slug}}/compose/production/postgres/backup.sh
@@ -1,6 +1,9 @@
-#!/bin/bash
-# stop on errors
-set -e
+#!/usr/bin/env bash
+
+set -o errexit
+set -o pipefail
+set -o nounset
+
 
 # we might run into trouble when using the default `postgres` user, e.g. when dropping the postgres
 # database in restore.sh. Check that something else is used here
diff --git a/{{cookiecutter.project_slug}}/compose/postgres/list-backups.sh b/{{cookiecutter.project_slug}}/compose/production/postgres/list-backups.sh
similarity index 53%
rename from {{cookiecutter.project_slug}}/compose/postgres/list-backups.sh
rename to {{cookiecutter.project_slug}}/compose/production/postgres/list-backups.sh
index 75972b75..2be3d1d6 100644
--- a/{{cookiecutter.project_slug}}/compose/postgres/list-backups.sh
+++ b/{{cookiecutter.project_slug}}/compose/production/postgres/list-backups.sh
@@ -1,4 +1,10 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+set -o errexit
+set -o pipefail
+set -o nounset
+
+
 echo "listing available backups"
 echo "-------------------------"
 ls /backups/
diff --git a/{{cookiecutter.project_slug}}/compose/postgres/restore.sh b/{{cookiecutter.project_slug}}/compose/production/postgres/restore.sh
similarity index 96%
rename from {{cookiecutter.project_slug}}/compose/postgres/restore.sh
rename to {{cookiecutter.project_slug}}/compose/production/postgres/restore.sh
index ddfc90d5..e7358949 100644
--- a/{{cookiecutter.project_slug}}/compose/postgres/restore.sh
+++ b/{{cookiecutter.project_slug}}/compose/production/postgres/restore.sh
@@ -1,7 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+set -o errexit
+set -o pipefail
+set -o nounset
 
-# stop on errors
-set -e
 
 # we might run into trouble when using the default `postgres` user, e.g. when dropping the postgres
 # database in restore.sh. Check that something else is used here
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 274e2806..10261781 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -108,6 +108,8 @@ MANAGERS = ADMINS
 # DATABASE CONFIGURATION
 # ------------------------------------------------------------------------------
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#databases
+# Uses django-environ to accept uri format
+# See: https://django-environ.readthedocs.io/en/latest/#supported-types
 DATABASES = {
     'default': env.db('DATABASE_URL', default='postgres://{% if cookiecutter.windows == 'y' %}localhost{% endif %}/{{cookiecutter.project_slug}}'),
 }
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index bf031d35..7ea188ce 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -159,7 +159,7 @@ ANYMAIL = {
     'MAILGUN_API_KEY': env('DJANGO_MAILGUN_API_KEY'),
     'MAILGUN_SENDER_DOMAIN': env('MAILGUN_SENDER_DOMAIN')
 }
-EMAIL_BACKEND = 'anymail.backends.mailgun.MailgunBackend'
+EMAIL_BACKEND = 'anymail.backends.mailgun.EmailBackend'
 
 # TEMPLATE CONFIGURATION
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index 0fbb4436..aaf131fa 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -1,14 +1,14 @@
 version: '2'
 
 volumes:
-  postgres_data_dev: {}
-  postgres_backup_dev: {}
+  postgres_data_local: {}
+  postgres_backup_local: {}
 
 services:
-  django: &django
+  django:{% if cookiecutter.use_celery == 'y' %} &django{% endif %}
     build:
       context: .
-      dockerfile: ./compose/django/Dockerfile-local
+      dockerfile: ./compose/local/django/Dockerfile
     depends_on:
       - postgres{% if cookiecutter.use_mailhog == 'y' %}
       - mailhog{% endif %}
@@ -19,13 +19,15 @@ services:
       - USE_DOCKER=yes
     ports:
       - "8000:8000"
-    command: /start-dev.sh
+    command: /start.sh
 
   postgres:
-    build: ./compose/postgres
+    build:
+      context: .
+      dockerfile: ./compose/production/postgres/Dockerfile
     volumes:
-      - postgres_data_dev:/var/lib/postgresql/data
-      - postgres_backup_dev:/backups
+      - postgres_data_local:/var/lib/postgresql/data
+      - postgres_backup_local:/backups
     environment:
       - POSTGRES_USER={{cookiecutter.project_slug}}
 {% if cookiecutter.use_mailhog == 'y' %}
@@ -46,7 +48,7 @@ services:
       - postgres{% if cookiecutter.use_mailhog == 'y' %}
       - mailhog{% endif %}
     ports: []
-    command: /start-celeryworker-dev.sh
+    command: /start-celeryworker.sh
 
   celerybeat:
     # https://github.com/docker/compose/issues/3220
@@ -56,5 +58,5 @@ services:
       - postgres{% if cookiecutter.use_mailhog == 'y' %}
       - mailhog{% endif %}
     ports: []
-    command: /start-celerybeat-dev.sh
+    command: /start-celerybeat.sh
 {% endif %}
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index 79e856df..ef9163e5 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -6,54 +6,52 @@ volumes:
   caddy: {}
 
 services:
-  django:
+  django:{% if cookiecutter.use_celery == 'y' %} &django{% endif %}
     build:
       context: .
-      dockerfile: ./compose/django/Dockerfile
+      dockerfile: ./compose/production/django/Dockerfile
     depends_on:
       - postgres
       - redis
-    command: /gunicorn.sh
     env_file: .env
+    command: /gunicorn.sh
 
   postgres:
-    build: ./compose/postgres
+    build:
+      context: .
+      dockerfile: ./compose/production/postgres/Dockerfile
     volumes:
       - postgres_data:/var/lib/postgresql/data
       - postgres_backup:/backups
     env_file: .env
 
   caddy:
-    build: ./compose/caddy
+    build:
+      context: .
+      dockerfile: ./compose/production/caddy/Dockerfile
     depends_on:
       - django
-    ports:
-      - "0.0.0.0:80:80"
-      - "0.0.0.0:443:443"
     volumes:
       - caddy:/root/.caddy
     env_file: .env
+    ports:
+      - "0.0.0.0:80:80"
+      - "0.0.0.0:443:443"
 
   redis:
     image: redis:3.0
 {% if cookiecutter.use_celery == 'y' %}
   celeryworker:
-    build:
-      context: .
-      dockerfile: ./compose/django/Dockerfile
-    env_file: .env
+    <<: *django
     depends_on:
      - postgres
      - redis
-    command: celery -A {{cookiecutter.project_slug}}.taskapp worker -l INFO
+    command: /start-celeryworker.sh
 
   celerybeat:
-    build:
-      context: .
-      dockerfile: ./compose/django/Dockerfile
-    env_file: .env
+    <<: *django
     depends_on:
       - postgres
       - redis
-    command: celery -A {{cookiecutter.project_slug}}.taskapp beat -l INFO
+    command: /start-celerybeat.sh
 {% endif %}
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 0e15afab..960522a8 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -2,16 +2,16 @@
 # like Pillow and psycopg2
 # See http://bitly.com/wheel-building-fails-CPython-35
 # Verified bug on Python 3.5.1
-wheel==0.29.0
+wheel==0.30.0
 
 
 # Bleeding edge Django
-django==1.10.7 # pyup: >=1.10,<1.11
+django==1.10.8 # pyup: >=1.10,<1.11
 
 # Configuration
 django-environ==0.4.4
 {% if cookiecutter.use_whitenoise == 'y' -%}
-whitenoise==3.3.0
+whitenoise==3.3.1
 {%- endif %}
 
 
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 4808d886..015a8235 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -4,8 +4,8 @@
 coverage==4.4.1
 django-coverage-plugin==1.5.0
 
-Sphinx==1.6.3
-django-extensions==1.9.0
+Sphinx==1.6.4
+django-extensions==1.9.1
 Werkzeug==0.12.2
 django-test-plus==1.0.18
 factory-boy==2.9.2
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index b9f09ca7..e6496cb2 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -4,8 +4,8 @@
 
 {% if cookiecutter.windows == 'y' -%}
 # Python-PostgreSQL Database Adapter
-# If using Win for dev, this assumes Unix in prod
-# ------------------------------------------------
+# Assuming Windows is used locally, and *nix -- in production.
+# ------------------------------------------------------------
 psycopg2==2.7.3.1
 {%- endif %}
 
@@ -24,12 +24,12 @@ Collectfast==0.5.2
 
 # Email backends for Mailgun, Postmark, SendGrid and more
 # -------------------------------------------------------
-django-anymail==0.11.1
+django-anymail==1.0
 
 {% if cookiecutter.use_sentry_for_error_reporting == "y" -%}
 # Raven is the Sentry client
 # --------------------------
-raven==6.1.0
+raven==6.2.1
 {%- endif %}
 
 {% if cookiecutter.use_opbeat == "y" -%}
diff --git a/{{cookiecutter.project_slug}}/requirements/test.txt b/{{cookiecutter.project_slug}}/requirements/test.txt
index c12222eb..8d21ed8b 100644
--- a/{{cookiecutter.project_slug}}/requirements/test.txt
+++ b/{{cookiecutter.project_slug}}/requirements/test.txt
@@ -11,6 +11,7 @@ coverage==4.4.1
 flake8==3.4.1 # pyup: != 2.6.0
 django-test-plus==1.0.18
 factory-boy==2.9.2
+django-coverage-plugin==1.5.0
 
 # pytest
 pytest-django==3.1.2
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/css/project.css b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/css/project.css
index 5f23c427..a7725c91 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/css/project.css
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/css/project.css
@@ -12,23 +12,6 @@
   border-color: #eed3d7;
 }
 
-/* This is a fix for the bootstrap4 alpha release */
-@media (max-width: 47.9em) {
-  .navbar-nav .nav-item {
-    float: none;
-    width: 100%;
-    display: inline-block;
-  }
-
-  .navbar-nav .nav-item + .nav-item {
-    margin-left: 0;
-  }
-
-  .nav.navbar-nav.pull-xs-right {
-    float: none !important;
-  }
-}
-
 /* Display django-debug-toolbar.
    See https://github.com/django-debug-toolbar/django-debug-toolbar/issues/742
    and https://github.com/pydanny/cookiecutter-django/issues/317
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss
index 8dafa220..6e701f29 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss
@@ -87,32 +87,6 @@ $red: #b94a48;
   color: $red;
 }
 
-////////////////////////////////
-		//Navbar//
-////////////////////////////////
-
-// This is a fix for the bootstrap4 alpha release
-
-.navbar {
-  border-radius: 0px;
-}
-
-@media (max-width: 47.9em) {
-  .navbar-nav .nav-item {
-    display: inline-block;
-    float: none;
-    width: 100%;
-  }
-
-  .navbar-nav .nav-item + .nav-item {
-    margin-left: 0;
-  }
-
-  .nav.navbar-nav.pull-xs-right {
-    float: none !important;
-  }
-}
-
 ////////////////////////////////
 		//Django Toolbar//
 ////////////////////////////////
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index 960cd860..6fdc1798 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -14,8 +14,8 @@
     <![endif]-->
 
     {% block css %}
-    <!-- Latest compiled and minified Bootstrap 4 Alpha 4 CSS -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
+    <!-- Latest compiled and minified Bootstrap 4 beta CSS -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
 
     <!-- Your stuff: Third-party CSS libraries go here -->
     {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress css %}{% endraw %}{% endif %}{% raw %}
@@ -29,7 +29,7 @@
   <body>
 
     <div class="m-b-1">
-      <nav class="navbar navbar-toggleable-md navbar-light bg-faded">
+      <nav class="navbar navbar-expand-md navbar-light bg-light">
         <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
           <span class="navbar-toggler-icon"></span>
         </button>
@@ -88,10 +88,10 @@
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
     {% block javascript %}
-      <!-- Required by Bootstrap v4 Alpha 4 -->
-      <script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n" crossorigin="anonymous"></script>
-      <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script>
-      <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>
+      <!-- Required by Bootstrap v4 beta -->
+      <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
+      <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
+      <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
 
       <!-- Your stuff: Third-party javascript libraries go here -->