diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index f19f2d1d3..2f567092a 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -44,3 +44,17 @@ if not pycharm:
         shutil.rmtree(os.path.join(project_directory, path))
 
 # ------------------------------------------------------------------------------
+
+
+import fileinput
+
+jdk_table_xml = os.path.join(project_directory, 'compose/pycharm/jdk.table.xml')
+jdk_table_dst_dir = os.path.join(os.path.expanduser('~'), '.PyCharm40/config/options/')
+
+for line in fileinput.input(jdk_table_xml, inplace=True):
+    print line.replace('$PROJECT_DIR$', project_directory),
+
+
+if not os.path.exists(jdk_table_dst_dir):
+    os.makedirs(jdk_table_dst_dir)
+    shutil.copy2(jdk_table_xml, jdk_table_dst_dir)
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__createsuperuser.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__createsuperuser.xml
similarity index 77%
rename from {{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__createsuperuser.xml
rename to {{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__createsuperuser.xml
index 944e74ede..d7fbe4045 100644
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__createsuperuser.xml
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__createsuperuser.xml
@@ -1,17 +1,17 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[edit to activate] Docker: createsuperuser" type="Python.DjangoServer" factoryName="Django server" singleton="true">
+  <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="ssh://docker@localhost:2222/usr/local/bin/python" />
+    <option name="SDK_HOME" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="false" />
+    <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="coco_repo" />
+    <module name="{{ cookiecutter.repo_name }}" />
     <PathMappingSettings>
       <option name="pathMappings">
         <list>
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__migrate.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__migrate.xml
similarity index 81%
rename from {{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__migrate.xml
rename to {{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__migrate.xml
index 64c1e2fd5..e0edc05a1 100644
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__migrate.xml
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__migrate.xml
@@ -1,17 +1,17 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[edit to activate] Docker: migrate" type="Python.DjangoServer" factoryName="Django server" singleton="true">
+  <configuration default="false" name="Docker: migrate" 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="ssh://docker@localhost:2222/usr/local/bin/python" />
+    <option name="SDK_HOME" value="sftp://docker@localhost:2222/usr/local/bin/python" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="coco_repo" />
+    <module name="{{ cookiecutter.repo_name }}" />
     <PathMappingSettings>
       <option name="pathMappings">
         <list>
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__runserver.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver.xml
similarity index 81%
rename from {{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__runserver.xml
rename to {{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver.xml
index fbbc0d2ad..6f5603927 100644
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__runserver.xml
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver.xml
@@ -1,17 +1,17 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[edit to activate] Docker: runserver" type="Python.DjangoServer" factoryName="Django server" singleton="true">
+  <configuration default="false" name="Docker: runserver" 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="ssh://docker@localhost:2222/usr/local/bin/python" />
+    <option name="SDK_HOME" value="sftp://docker@localhost:2222/usr/local/bin/python" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="coco_repo" />
+    <module name="{{ cookiecutter.repo_name }}" />
     <PathMappingSettings>
       <option name="pathMappings">
         <list>
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__runserver_plus.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver_plus.xml
similarity index 81%
rename from {{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__runserver_plus.xml
rename to {{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver_plus.xml
index 2700e389c..de2e3fede 100644
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__runserver_plus.xml
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver_plus.xml
@@ -1,17 +1,17 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[edit to activate] Docker: runserver_plus" type="Python.DjangoServer" factoryName="Django server" singleton="true">
+  <configuration default="false" name="Docker: runserver_plus" 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="ssh://docker@localhost:2222/usr/local/bin/python" />
+    <option name="SDK_HOME" value="sftp://docker@localhost:2222/usr/local/bin/python" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="coco_repo" />
+    <module name="{{ cookiecutter.repo_name }}" />
     <PathMappingSettings>
       <option name="pathMappings">
         <list>
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__tests___all.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___all.xml
similarity index 79%
rename from {{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__tests___all.xml
rename to {{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___all.xml
index 5fd35d64e..13557205a 100644
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__tests___all.xml
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___all.xml
@@ -1,17 +1,17 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[edit to activate] Docker: tests - all" type="DjangoTestsConfigurationType" factoryName="Django tests" singleton="true">
+  <configuration default="false" name="Docker: tests - all" type="DjangoTestsConfigurationType" factoryName="Django tests" 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="ssh://docker@localhost:2222/usr/local/bin/python" />
+    <option name="SDK_HOME" value="sftp://docker@localhost:2222/usr/local/bin/python" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="coco_repo" />
+    <module name="{{ cookiecutter.repo_name }}" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
     <PathMappingSettings>
       <option name="pathMappings">
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__tests___users.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___users.xml
similarity index 72%
rename from {{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__tests___users.xml
rename to {{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___users.xml
index b642b0538..72d55ef2d 100644
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/_edit_to_activate__Docker__tests___users.xml
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___users.xml
@@ -1,17 +1,17 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="[edit to activate] Docker: tests - users" type="DjangoTestsConfigurationType" factoryName="Django tests" singleton="true">
+  <configuration default="false" name="Docker: tests - users" type="DjangoTestsConfigurationType" factoryName="Django tests" 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="ssh://docker@localhost:2222/usr/local/bin/python" />
+    <option name="SDK_HOME" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="false" />
+    <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="coco_repo" />
+    <module name="{{ cookiecutter.repo_name }}" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
     <PathMappingSettings>
       <option name="pathMappings">
@@ -20,7 +20,7 @@
         </list>
       </option>
     </PathMappingSettings>
-    <option name="TARGET" value=" wawel_repo.users" />
+    <option name="TARGET" value="{{ cookiecutter.repo_name }}.users" />
     <option name="SETTINGS_FILE" value="" />
     <option name="CUSTOM_SETTINGS" value="false" />
     <option name="USE_OPTIONS" value="false" />
diff --git a/{{cookiecutter.repo_name}}/.idea/{{cookiecutter.repo_name}}.iml b/{{cookiecutter.repo_name}}/.idea/{{cookiecutter.repo_name}}.iml
index 2f2a9192b..053da0e7c 100644
--- a/{{cookiecutter.repo_name}}/.idea/{{cookiecutter.repo_name}}.iml
+++ b/{{cookiecutter.repo_name}}/.idea/{{cookiecutter.repo_name}}.iml
@@ -12,7 +12,7 @@
   </component>
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Remote Python 2.7.9 (sftp://docker@localhost:2222/usr/local/bin/python)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TemplatesService">
diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint b/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint
index dbc4bbd12..cc51a7b89 100755
--- a/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint
+++ b/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint
@@ -22,17 +22,14 @@ fi
 
 useradd $useraddOptions $user
 
-ln -s /pycharm_helpers/ /home/$user/.pycharm_helpers
-chown -R $user:$user /pycharm_helpers/
-
 mkdir /home/$user/.ssh
 cat /ssh_id_rsa.pub > /home/$user/.ssh/authorized_keys
 
 chown $user:$user /home/$user
 chmod 755 /home/$user
 chmod 700 /home/$user/.ssh
-700 /home/docker/.ssh
-600 /home/docker/.ssh/authorized_keys
+chmod 700 /home/docker/.ssh
+chmod 600 /home/docker/.ssh/authorized_keys
 
 chown -R $user:$user /home/$user/
 
diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/jdk.table.xml b/{{cookiecutter.repo_name}}/compose/pycharm/jdk.table.xml
new file mode 100644
index 000000000..1a4f35668
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/compose/pycharm/jdk.table.xml
@@ -0,0 +1,19 @@
+<application>
+  <component name="ProjectJdkTable">
+    <jdk version="2">
+      <name value="Remote Python 2.7.9 (ssh://docker@localhost:2222/usr/local/bin/python)" />
+      <type value="Python SDK" />
+      <homePath value="ssh://docker@localhost:2222/usr/local/bin/python" />
+      <roots>
+        <classPath>
+          <root type="composite" />
+        </classPath>
+        <sourcePath>
+          <root type="composite" />
+        </sourcePath>
+      </roots>
+      <additional HOST="localhost" PORT="2222" ANONYMOUS="false" USERNAME="docker" PASSWORD="" PRIVATE_KEY_FILE="$PROJECT_DIR$/compose/pycharm/.ssh_keys_to_docker/id_rsa" MY_KNOWN_HOSTS_FILE="" PASSPHRASE="" USE_KEY_PAIR="true" INTERPRETER_PATH="/usr/local/bin/python" HELPERS_PATH="/home/docker/.pycharm_helpers/" INITIALIZED="false" VALID="true" SKELETONS_PATH="" />
+    </jdk>
+  </component>
+</application>
+
diff --git a/{{cookiecutter.repo_name}}/debug.yml b/{{cookiecutter.repo_name}}/debug.yml
index a548d2c79..8cfe0cfc7 100644
--- a/{{cookiecutter.repo_name}}/debug.yml
+++ b/{{cookiecutter.repo_name}}/debug.yml
@@ -13,15 +13,8 @@ debug:
    - "2222:22"
   volumes:
    - .:/app
-  volumes_from:
-   - pycharmhelpers
   environment:
     SFTP_USER: docker
     SFTP_PASS: docker
   links:
    - postgres
-
-pycharmhelpers:
-  image: pcdocker/pycharm_helpers
-  volumes:
-    - /pycharm_helpers