diff --git a/README.rst b/README.rst
index 8a8996a4..50617694 100644
--- a/README.rst
+++ b/README.rst
@@ -122,6 +122,7 @@ It prompts you for questions. Answer them::
     use_sentry [n]: y
     use_newrelic [n]: y
     use_opbeat [n]: y
+    use_pycharm [n]: y
     windows [n]: n
     use_python2 [n]: y
     Select open_source_license:
diff --git a/{{cookiecutter.repo_name}}/Dockerfile b/{{cookiecutter.repo_name}}/compose/django/Dockerfile
similarity index 100%
rename from {{cookiecutter.repo_name}}/Dockerfile
rename to {{cookiecutter.repo_name}}/compose/django/Dockerfile
diff --git a/{{cookiecutter.repo_name}}/Dockerfile-dev b/{{cookiecutter.repo_name}}/compose/django/Dockerfile-dev
similarity index 100%
rename from {{cookiecutter.repo_name}}/Dockerfile-dev
rename to {{cookiecutter.repo_name}}/compose/django/Dockerfile-dev
diff --git a/{{cookiecutter.repo_name}}/dev.yml b/{{cookiecutter.repo_name}}/dev.yml
index b48f53c8..1c3c5367 100644
--- a/{{cookiecutter.repo_name}}/dev.yml
+++ b/{{cookiecutter.repo_name}}/dev.yml
@@ -13,7 +13,7 @@ services:
   django:
     build:
       context: .
-      dockerfile: Dockerfile-dev
+      dockerfile: ./compose/django/Dockerfile-dev
     command: python /app/manage.py runserver_plus 0.0.0.0:8000
     depends_on:
       - postgres
diff --git a/{{cookiecutter.repo_name}}/docker-compose.yml b/{{cookiecutter.repo_name}}/docker-compose.yml
index 798cb232..c1ae2cbf 100644
--- a/{{cookiecutter.repo_name}}/docker-compose.yml
+++ b/{{cookiecutter.repo_name}}/docker-compose.yml
@@ -10,6 +10,7 @@ services:
   django:
     build:
       context: .
+      dockerfile: ./compose/django/Dockerfile
     user: django
     depends_on:
       - postgres