diff --git a/{{cookiecutter.repo_name}}/Dockerfile b/{{cookiecutter.repo_name}}/Dockerfile
index 8810d8f9..b7933b21 100644
--- a/{{cookiecutter.repo_name}}/Dockerfile
+++ b/{{cookiecutter.repo_name}}/Dockerfile
@@ -6,11 +6,9 @@ FROM python:2.7
 ENV PYTHONUNBUFFERED 1
 
 # Requirements have to be pulled and installed here, otherwise caching won't work
-ADD ./requirements /requirements
-ADD ./requirements.txt /requirements.txt
+ADD ./requirements/production.txt /requirements/production.txt
 
-RUN pip install -r /requirements.txt
-RUN pip install -r /requirements/local.txt
+RUN pip install -r /requirements/production.txt
 
 RUN groupadd -r django && useradd -r -g django django
 ADD . /app
diff --git a/{{cookiecutter.repo_name}}/Dockerfile-dev b/{{cookiecutter.repo_name}}/Dockerfile-dev
new file mode 100644
index 00000000..6f6d061b
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/Dockerfile-dev
@@ -0,0 +1,25 @@
+{% if cookiecutter.use_python2 == 'n' -%}
+FROM python:3.5
+{% else %}
+FROM python:2.7
+{%- endif %}
+ENV PYTHONUNBUFFERED 1
+
+# Requirements have to be pulled and installed here, otherwise caching won't work
+ADD ./requirements/local.txt /requirements/local.txt
+
+RUN pip install -r /requirements/local.txt
+
+RUN groupadd -r django && useradd -r -g django django
+ADD . /app
+RUN chown -R django /app
+
+ADD ./compose/django/gunicorn.sh /gunicorn.sh
+ADD ./compose/django/entrypoint.sh /entrypoint.sh
+
+RUN chmod +x /entrypoint.sh && chown django /entrypoint.sh
+RUN chmod +x /gunicorn.sh && chown django /gunicorn.sh
+
+WORKDIR /app
+
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/{{cookiecutter.repo_name}}/dev.yml b/{{cookiecutter.repo_name}}/dev.yml
index 98146ffe..4993ef75 100644
--- a/{{cookiecutter.repo_name}}/dev.yml
+++ b/{{cookiecutter.repo_name}}/dev.yml
@@ -1,3 +1,5 @@
+dockerfile: Dockerfile-dev
+
 postgres:
   image: postgres
   volumes: