diff --git a/{{cookiecutter.repo_name}}/.idea/webServers.xml b/{{cookiecutter.repo_name}}/.idea/webServers.xml
index f012dd838..3be09d4c6 100644
--- a/{{cookiecutter.repo_name}}/.idea/webServers.xml
+++ b/{{cookiecutter.repo_name}}/.idea/webServers.xml
@@ -3,7 +3,7 @@
   <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/pycharm/.ssh_keys_to_docker/id_rsa" accessType="SFTP" username="docker_{{ cookiecutter.repo_name }}" keyPair="true">
+        <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>
diff --git a/{{cookiecutter.repo_name}}/compose/debug/entrypoint.sh b/{{cookiecutter.repo_name}}/compose/debug/entrypoint.sh
index 3699fe60c..228ed17a3 100755
--- a/{{cookiecutter.repo_name}}/compose/debug/entrypoint.sh
+++ b/{{cookiecutter.repo_name}}/compose/debug/entrypoint.sh
@@ -1,16 +1,15 @@
 #!/bin/bash
 
-/app/compose/django/entrypoint.sh echo
+/app/compose/django/entrypoint.sh :
 
 USER=docker_{{ cookiecutter.repo_name }}
 
 # rename django username to docker_{{ cookiecutter.repo_name }}
-usermod -l $USER django
-usermod -l $USER -m -d /home/new_username django
+usermod -l $USER -m -d /home/$USER django
 groupmod -n $USER django
 
 mkdir /home/$USER/.ssh
-cat /app/compose/debug/keys_to_docker/ssh_id_rsa.pub > /home/$USER/.ssh/authorized_keys
+cat /app/compose/debug/keys_to_docker/id_rsa.pub > /home/$USER/.ssh/authorized_keys
 
 chmod 755 /home/$USER
 chmod 700 /home/$USER/.ssh
@@ -19,7 +18,8 @@ chown -R $USER:$USER /home/$USER
 
 echo "$USER:docker" | chpasswd
 
-# starting ssh (detached)
-exec /etc/init.d/ssh start &
+service ssh start
 
-su -c 'python -c "import signal; signal.pause()"' $USER
+cat /app/compose/debug/welcome_msg
+
+sleep infinity
diff --git a/{{cookiecutter.repo_name}}/compose/debug/welcome_msg b/{{cookiecutter.repo_name}}/compose/debug/welcome_msg
new file mode 100644
index 000000000..4b3c5b8ed
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/compose/debug/welcome_msg
@@ -0,0 +1,12 @@
+
+You can now debug your project remotly using ssh connection:
+
+  User: docker_light
+  Password: docker
+
+You can also login without password, using debug-only ssh key:
+
+  $ ssh -i compose/debug/keys_to_docker/id_rsa docker_{{ cookiecutter.repo_name }}@localhost -p 2222
+
+Read more about remote debugging with various IDE (PyCharm, etc) in docs/docker_remote_debugging.rst
+