diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/Dockerfile b/{{cookiecutter.repo_name}}/compose/pycharm/Dockerfile
index a73bbc24f..62e426db3 100644
--- a/{{cookiecutter.repo_name}}/compose/pycharm/Dockerfile
+++ b/{{cookiecutter.repo_name}}/compose/pycharm/Dockerfile
@@ -1,4 +1,4 @@
-FROM {{cookiecutter.repo_name}}_django
+FROM {{ cookiecutter.repo_name|replace('_', '') }}_django
 
 ENV SFTP_USER docker
 ENV SFTP_PASS changeme
@@ -18,5 +18,6 @@ COPY sshd_config /etc/ssh/sshd_config
 COPY entrypoint /
 
 EXPOSE 22
+EXPOSE 8000
 
 ENTRYPOINT ["/entrypoint"]
diff --git a/{{cookiecutter.repo_name}}/debug.yml b/{{cookiecutter.repo_name}}/debug.yml
index 7244403d5..69fa522b7 100644
--- a/{{cookiecutter.repo_name}}/debug.yml
+++ b/{{cookiecutter.repo_name}}/debug.yml
@@ -1,7 +1,9 @@
 postgres:
-  extends:
-    file: dev.yml
-    service: postgres
+  image: postgres
+  volumes:
+    # If you are using boot2docker, postgres data has to live in the VM for now until #581 is fixed
+    # for more info see here: https://github.com/boot2docker/boot2docker/issues/581
+    - /data/{{cookiecutter.repo_name}}/postgres:/var/lib/postgresql/data
 
 debug:
   build: compose/pycharm/