diff --git a/{{cookiecutter.repo_name}}/.idea/deployment.xml b/{{cookiecutter.repo_name}}/.idea/deployment.xml
deleted file mode 100644
index 270023ec2..000000000
--- a/{{cookiecutter.repo_name}}/.idea/deployment.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PublishConfigData" serverName="docker_{{ cookiecutter.repo_name }}">
-    <serverData>
-      <paths name="docker">
-        <serverdata>
-          <mappings>
-            <mapping deploy="/app" local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-    </serverData>
-  </component>
-</project>
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__createsuperuser.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__createsuperuser.xml
deleted file mode 100644
index b88cee683..000000000
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__createsuperuser.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Docker: createsuperuser" type="Python.DjangoServer" factoryName="Django server" singleton="true">
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="PARENT_ENVS" value="true" />
-    <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
-      <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
-    </envs>
-    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="true" />
-    <option name="ADD_CONTENT_ROOTS" value="true" />
-    <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="{{ cookiecutter.repo_name }}" />
-    <PathMappingSettings>
-      <option name="pathMappings">
-        <list>
-          <mapping local-root="$PROJECT_DIR$" remote-root="/app" />
-        </list>
-      </option>
-    </PathMappingSettings>
-    <option name="launchJavascriptDebuger" value="false" />
-    <option name="host" value="" />
-    <option name="additionalOptions" value="" />
-    <option name="browserUrl" value="" />
-    <option name="runTestServer" value="false" />
-    <option name="runNoReload" value="false" />
-    <option name="useCustomRunCommand" value="true" />
-    <option name="customRunCommand" value="createsuperuser" />
-    <method />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_build.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_build.xml
index 5aef1f6c4..3da143008 100644
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_build.xml
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_build.xml
@@ -5,7 +5,7 @@
     <envs>
       <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="SDK_HOME" value="docker-compose://$PROJECT_DIR$/dev.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.repo_name}}/.idea/runConfigurations/Docker__grunt_compass.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_compass.xml
index a00c9920b..f76182b22 100644
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_compass.xml
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_compass.xml
@@ -5,7 +5,7 @@
     <envs>
       <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="SDK_HOME" value="docker-compose://$PROJECT_DIR$/dev.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.repo_name}}/.idea/runConfigurations/Docker__grunt_serve.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_serve.xml
index 0f1ef6da8..9f273000f 100644
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_serve.xml
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_serve.xml
@@ -5,7 +5,7 @@
     <envs>
       <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="SDK_HOME" value="docker-compose://$PROJECT_DIR$/dev.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.repo_name}}/.idea/runConfigurations/Docker__grunt_start_email_server.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_start_email_server.xml
index a42ee122b..e3933d41e 100644
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_start_email_server.xml
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_start_email_server.xml
@@ -5,7 +5,7 @@
     <envs>
       <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="SDK_HOME" value="docker-compose://$PROJECT_DIR$/dev.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.repo_name}}/.idea/runConfigurations/Docker__grunt_stop_email_server.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_stop_email_server.xml
index 7b44b338b..73b3e89aa 100644
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_stop_email_server.xml
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_stop_email_server.xml
@@ -5,7 +5,7 @@
     <envs>
       <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="SDK_HOME" value="docker-compose://$PROJECT_DIR$/dev.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.repo_name}}/.idea/runConfigurations/Docker__grunt_watch.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_watch.xml
index d6cebf82b..2f72a3331 100644
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_watch.xml
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_watch.xml
@@ -5,7 +5,7 @@
     <envs>
       <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="SDK_HOME" value="docker-compose://$PROJECT_DIR$/dev.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.repo_name}}/.idea/runConfigurations/Docker__migrate.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__migrate.xml
index 0d4bd1b5c..f95484d91 100644
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__migrate.xml
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__migrate.xml
@@ -3,10 +3,10 @@
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
       <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
+      <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="SDK_HOME" value="docker-compose://$PROJECT_DIR$/dev.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.repo_name}}/.idea/runConfigurations/Docker__npm_install.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__npm_install.xml
index b2ef977aa..cf06f94fc 100644
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__npm_install.xml
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__npm_install.xml
@@ -5,7 +5,7 @@
     <envs>
       <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="SDK_HOME" value="docker-compose://$PROJECT_DIR$/dev.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.repo_name}}/.idea/runConfigurations/Docker__runserver.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver.xml
index 5f47bd3c5..b4a02fb38 100644
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver.xml
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver.xml
@@ -3,10 +3,10 @@
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
       <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
+      <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="SDK_HOME" value="docker-compose://$PROJECT_DIR$/dev.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.repo_name}}/.idea/runConfigurations/Docker__runserver_plus.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver_plus.xml
index 289ee6c34..e05305c0d 100644
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver_plus.xml
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver_plus.xml
@@ -3,10 +3,10 @@
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
       <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
+      <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="SDK_HOME" value="docker-compose://$PROJECT_DIR$/dev.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.repo_name}}/.idea/runConfigurations/Docker__tests___all.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___all.xml
index 9b77b4a65..49763a014 100644
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___all.xml
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___all.xml
@@ -3,10 +3,10 @@
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
       <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
+      <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="SDK_HOME" value="docker-compose://$PROJECT_DIR$/dev.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.repo_name}}/.idea/runConfigurations/Docker__tests___class__TestUser.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___class__TestUser.xml
index fc4d53ead..f6c6110a5 100644
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___class__TestUser.xml
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___class__TestUser.xml
@@ -3,10 +3,10 @@
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
       <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
+      <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="SDK_HOME" value="docker-compose://$PROJECT_DIR$/dev.yml:django/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.repo_name}}/.idea/runConfigurations/Docker__tests___file__test_models.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___file__test_models.xml
index cbdf088d7..18ff30171 100644
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___file__test_models.xml
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___file__test_models.xml
@@ -3,10 +3,10 @@
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
       <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
+      <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="SDK_HOME" value="docker-compose://$PROJECT_DIR$/dev.yml:django/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.repo_name}}/.idea/runConfigurations/Docker__tests___module__users.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___module__users.xml
index 1a8c2b94a..2c47fce2a 100644
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___module__users.xml
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___module__users.xml
@@ -3,10 +3,10 @@
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
       <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
+      <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="SDK_HOME" value="docker-compose://$PROJECT_DIR$/dev.yml:django/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.repo_name}}/.idea/runConfigurations/Docker__tests___specific__test_get_absolute_url.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___specific__test_get_absolute_url.xml
index 467aab0fb..a359a82cc 100644
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___specific__test_get_absolute_url.xml
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___specific__test_get_absolute_url.xml
@@ -3,10 +3,10 @@
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
       <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
+      <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="SDK_HOME" value="docker-compose://$PROJECT_DIR$/dev.yml:django/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.repo_name}}/.idea/webServers.xml b/{{cookiecutter.repo_name}}/.idea/webServers.xml
deleted file mode 100644
index 3be09d4c6..000000000
--- a/{{cookiecutter.repo_name}}/.idea/webServers.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="WebServers">
-    <option name="servers">
-      <webServer id="ce16d0a1-6207-4682-89cf-b5cca576c85c" name="docker_{{ cookiecutter.repo_name }}" url="http://localhost">
-        <fileTransfer host="localhost" port="2222" privateKey="$PROJECT_DIR$/compose/debug/keys_to_docker/id_rsa" accessType="SFTP" username="docker_{{ cookiecutter.repo_name }}" keyPair="true">
-          <advancedOptions>
-            <advancedOptions dataProtectionLevel="Private" />
-          </advancedOptions>
-        </fileTransfer>
-      </webServer>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/debug.yml b/{{cookiecutter.repo_name}}/debug.yml
deleted file mode 100644
index 3f3122b0d..000000000
--- a/{{cookiecutter.repo_name}}/debug.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-postgres:
-  image: postgres
-  ports:
-   - "25432:5432"
-  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/debug/
-  ports:
-   - "8000:8000"
-   - "2222:22"
-  volumes:
-   - .:/app
-  environment:
-    SFTP_USER: docker_{{ cookiecutter.repo_name }}
-    SFTP_PASS: docker
-  links:
-   - postgres
diff --git a/{{cookiecutter.repo_name}}/dev.yml b/{{cookiecutter.repo_name}}/dev.yml
index b48f53c89..674f14228 100644
--- a/{{cookiecutter.repo_name}}/dev.yml
+++ b/{{cookiecutter.repo_name}}/dev.yml
@@ -25,3 +25,16 @@ services:
       - "8000:8000"
     links:
       - postgres
+
+  pycharm:
+    build:
+      context: .
+      dockerfile: Dockerfile-dev
+    depends_on:
+      - postgres
+    environment:
+      - POSTGRES_USER={{cookiecutter.repo_name}}
+    volumes:
+      - .:/app
+    links:
+      - postgres