diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/.ssh_keys_to_docker/id_rsa b/{{cookiecutter.repo_name}}/compose/pycharm/.ssh_keys_to_docker/id_rsa
new file mode 100644
index 000000000..4c0fd606e
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/compose/pycharm/.ssh_keys_to_docker/id_rsa
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEA00Y4OkYh+gRBpgtggWy3S2ym4syDQrbp2wCMIUJo8lfzGEv8
+b2LJAAC/dtPSnJoEX9FXTcN+4KXwZ+mGrv+BIfkRL7BiDPzIeitIt2XE6258d/y2
+G8H1V184WtSDofEcHFGXUYzjhstrn/XYmnIAYgHv8Rc9KCnlLr6biKo/KaR6YeAa
+wqdoFM303PJEoDo2PDLUbhS8sgQwjZcQ/uoAdzboNpDaYvPgM3KmgBcHWkBPcUgT
+TZkzbJ1Domqlq1LZAB+Yg3shGqIHwUVdb2G1tRtAMNg/XSXPXr1Ybi1sgYYRScLk
+l7xVlV8Lzbpv3axZJ4HXWAA4I/L3y2337DkvkQIDAQABAoIBAQCmWfnX2HTUORm/
+teGMxp8kIi7dEQ6hLwi/SZUMcw/TEXD1Ro9C3NNKz0vyMiL470RWdax6LF3wYHgE
+OZm0nLV+nG/tzsHFXBw2JXKiBN2iSmJyz2ZMQNH+s5jZ286xafkqSwwMSBS2g+EA
+GEEuimjGwqO8fwHGaAZuYeJxHyuQiuSkpeMZiSCAAIRa64Lc9cA9KOF2Gel8D/ua
+NsffhPxqSwKI1jxkgBXekvA4jQLaubQTU9VUkb9d4oiRctacPzu/TWojXrlqPfph
+7ZcDXTPIp9aktHQtzcW6lBojIHAQGFxCaVIWFE5caOJVkxiz31VeFFHOt+n3I6dF
+fB9maX6BAoGBAPSuH92uJSrvlcDsndBylW0v/rJHaFoYU3WVIO57N56z22bKRwCg
+9Ew+WFfrboMbWk7uVLEzvVXuY3r1n+9uYT136ib3dLoGYArPlHO6qo8bpkTR1CkR
+zYW91yHnHt7TW1HX1iq8zlhVEPW7cRn+1U7VORdNtsLDN02QGEuFM+65AoGBAN0M
+c6vIpzfkGIUVoLI/o6sJ6n+aOCPSyORvG6UWdc7M9Hhsptqv1CCUfMADO+Hr6EKg
+lBukZ9ixTh83MCzIKVcJhIaCKwf4loqDVnBGSpZh6jmR8M3XhkTYJXZ6s3Po9pXq
+zsTK1YTplvNNWHmlDbR1YVPnbpfw898heIP1EhuZAoGBALqyGhJ2DFokkWmxogEp
+TScRFhBGODN2mEgB0Czny9rGdcSK1359UarTb2k2dQ6I0nGjnO/RAMkOqs1pme2B
+laTnWLz+2AwRTTsyhJ2Bcx7bBBVC3dWwhddksUBnL8DqGKXsQLg/dFsmHVjC+1vQ
+fEY4n+VOIQOfHRWLu130d1nRAoGADgtwfgWtujtf43TQVQL+HyvuHlVqI7yMzxbQ
+Jtkaex1CmzQsFdD+JWPJ2VlbQKuAgls5jdgQURBS6mDTSsUc+067gOBcY5FD32Eg
+6NlOe+eUvjurlSiQe2dQWgrJxB+VK0lUAeTxVBSTZroPWQtHp6Odn3sg576DgDXc
+NmYn1GECgYEA0N1ML106sS0BZauMhGvXMapNJgSg35z8TtbcHdgb+tkQigXM7g1c
+4/MAHcEcs9c1iM6QtirefqUY6g5RFEIu0Wkmf6iwctmQQbMnrwB8yg+07HLahLim
+SYMBxjdAP4SsmqHKU6Er9hRLvWlVKD1PtRYrhGpZpDq+PSPoQh0Kg8c=
+-----END RSA PRIVATE KEY-----
diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/.ssh_keys_to_docker/id_rsa.pub b/{{cookiecutter.repo_name}}/compose/pycharm/.ssh_keys_to_docker/id_rsa.pub
new file mode 100644
index 000000000..0e41ced2e
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/compose/pycharm/.ssh_keys_to_docker/id_rsa.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTRjg6RiH6BEGmC2CBbLdLbKbizINCtunbAIwhQmjyV/MYS/xvYskAAL9209KcmgRf0VdNw37gpfBn6Yau/4Eh+REvsGIM/Mh6K0i3ZcTrbnx3/LYbwfVXXzha1IOh8RwcUZdRjOOGy2uf9diacgBiAe/xFz0oKeUuvpuIqj8ppHph4BrCp2gUzfTc8kSgOjY8MtRuFLyyBDCNlxD+6gB3Nug2kNpi8+AzcqaAFwdaQE9xSBNNmTNsnUOiaqWrUtkAH5iDeyEaogfBRV1vYbW1G0Aw2D9dJc9evVhuLWyBhhFJwuSXvFWVXwvNum/drFkngddYADgj8vfLbffsOS+R  pubkey2docker
diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/Dockerfile b/{{cookiecutter.repo_name}}/compose/pycharm/Dockerfile
index 62e426db3..e827d1f92 100644
--- a/{{cookiecutter.repo_name}}/compose/pycharm/Dockerfile
+++ b/{{cookiecutter.repo_name}}/compose/pycharm/Dockerfile
@@ -15,6 +15,8 @@ RUN mkdir -p /var/run/sshd
 
 # Copy configuration and entrypoint script
 COPY sshd_config /etc/ssh/sshd_config
+ADD .ssh_keys_to_docker/id_rsa.pub /ssh_id_rsa.pub
+
 COPY entrypoint /
 
 EXPOSE 22
diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint b/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint
index af71be536..dbc4bbd12 100755
--- a/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint
+++ b/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint
@@ -21,15 +21,20 @@ if [ -n "${USER_GID}" ]; then
 fi
 
 useradd $useraddOptions $user
-chown $user:$user /home/$user
-chmod 755 /home/$user
 
 ln -s /pycharm_helpers/ /home/$user/.pycharm_helpers
-chown -R $user:$user /pycharm_helpers/ /home/$user/.pycharm_helpers
+chown -R $user:$user /pycharm_helpers/
 
-# TODO: get public key authorization to work
 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
+
+chown -R $user:$user /home/$user/
 
 if [ -z "$pass" ]; then
     pass="$(echo `</dev/urandom tr -dc A-Za-z0-9 | head -c256`)"
diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/sshd_config b/{{cookiecutter.repo_name}}/compose/pycharm/sshd_config
index 837f596fc..2600a9a9e 100644
--- a/{{cookiecutter.repo_name}}/compose/pycharm/sshd_config
+++ b/{{cookiecutter.repo_name}}/compose/pycharm/sshd_config
@@ -43,7 +43,7 @@ StrictModes yes
 
 # Erlaubt Public Key Authentification
 # Default ist yes, wenn man es nicht benutzt kann man es auch abschalten
-PubkeyAuthentication no
+PubkeyAuthentication yes
 
 # Erlaubt die Anmeldung mit Passwörtern. Bevor man dies abschaltet, sollte man einen anderen Weg haben!
 PasswordAuthentication yes
@@ -79,4 +79,4 @@ PrintMotd no
 # Diese Settings sollten selbsterklärend sein.
 KeepAlive yes
 PrintLastLog yes
-UsePAM yes
\ No newline at end of file
+UsePAM yes