diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__createsuperuser.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__createsuperuser.xml
new file mode 100644
index 000000000..604631d9f
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__createsuperuser.xml
@@ -0,0 +1,32 @@
+<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="ssh://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="wawel_repo" />
+    <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__migrate.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__migrate.xml
new file mode 100644
index 000000000..54e14092e
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__migrate.xml
@@ -0,0 +1,32 @@
+<component name="ProjectRunConfigurationManager">
+  <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="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="wawel_repo" />
+    <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="migrate" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver.xml
similarity index 87%
rename from {{cookiecutter.repo_name}}/.idea/runConfigurations/Docker.xml
rename to {{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver.xml
index 19d89d673..e59040b19 100644
--- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker.xml
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Docker" 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>
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="{{ cookiecutter.repo_name }}" />
+    <module name="wawel_repo" />
     <PathMappingSettings>
       <option name="pathMappings">
         <list>
@@ -30,4 +30,4 @@
     <option name="customRunCommand" value="" />
     <method />
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver_plus.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver_plus.xml
new file mode 100644
index 000000000..808b7e46e
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__runserver_plus.xml
@@ -0,0 +1,33 @@
+<component name="ProjectRunConfigurationManager">
+  <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="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="wawel_repo" />
+    <PathMappingSettings>
+      <option name="pathMappings">
+        <list>
+          <mapping local-root="$PROJECT_DIR$" remote-root="/app" />
+        </list>
+      </option>
+    </PathMappingSettings>
+    <option name="launchJavascriptDebuger" value="false" />
+    <option name="port" value="8000" />
+    <option name="host" value="0.0.0.0" />
+    <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="runserver_plus" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___all.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___all.xml
new file mode 100644
index 000000000..55ac834b3
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___all.xml
@@ -0,0 +1,30 @@
+<component name="ProjectRunConfigurationManager">
+  <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="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="wawel_repo" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+    <PathMappingSettings>
+      <option name="pathMappings">
+        <list>
+          <mapping local-root="$PROJECT_DIR$" remote-root="/app" />
+        </list>
+      </option>
+    </PathMappingSettings>
+    <option name="TARGET" value="." />
+    <option name="SETTINGS_FILE" value="" />
+    <option name="CUSTOM_SETTINGS" value="false" />
+    <option name="USE_OPTIONS" value="false" />
+    <option name="OPTIONS" value="" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___users.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___users.xml
new file mode 100644
index 000000000..2a70c758e
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___users.xml
@@ -0,0 +1,30 @@
+<component name="ProjectRunConfigurationManager">
+  <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="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="wawel_repo" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+    <PathMappingSettings>
+      <option name="pathMappings">
+        <list>
+          <mapping local-root="$PROJECT_DIR$" remote-root="/app" />
+        </list>
+      </option>
+    </PathMappingSettings>
+    <option name="TARGET" value=" wawel_repo.users" />
+    <option name="SETTINGS_FILE" value="" />
+    <option name="CUSTOM_SETTINGS" value="false" />
+    <option name="USE_OPTIONS" value="false" />
+    <option name="OPTIONS" value="" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint b/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint
index 42e1dc85d..af71be536 100755
--- a/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint
+++ b/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint
@@ -25,7 +25,7 @@ chown $user:$user /home/$user
 chmod 755 /home/$user
 
 ln -s /pycharm_helpers/ /home/$user/.pycharm_helpers
-chown $user:$user /pycharm_helpers/ /home/$user/.pycharm_helpers
+chown -R $user:$user /pycharm_helpers/ /home/$user/.pycharm_helpers
 
 # TODO: get public key authorization to work
 mkdir /home/$user/.ssh
diff --git a/{{cookiecutter.repo_name}}/debug.yml b/{{cookiecutter.repo_name}}/debug.yml
index 69fa522b7..a548d2c79 100644
--- a/{{cookiecutter.repo_name}}/debug.yml
+++ b/{{cookiecutter.repo_name}}/debug.yml
@@ -13,9 +13,15 @@ debug:
    - "2222:22"
   volumes:
    - .:/app
-   - /data/{{cookiecutter.repo_name}}/pycharm_helpers:/pycharm_helpers/
+  volumes_from:
+   - pycharmhelpers
   environment:
     SFTP_USER: docker
     SFTP_PASS: docker
   links:
    - postgres
+
+pycharmhelpers:
+  image: pcdocker/pycharm_helpers
+  volumes:
+    - /pycharm_helpers