diff --git a/Dockerfile.desktop b/Dockerfile.desktop
index 42c02befc9f81daeb01040b409eb37b0040f4006..c8c8d9220e5298f2cd5c0dc16827ba3fb204ff67 100644
--- a/Dockerfile.desktop
+++ b/Dockerfile.desktop
@@ -20,7 +20,7 @@ RUN sed -e '$s/ash/bash/' /etc/passwd
 COPY start.desktop.sh .
 RUN chmod 500 start.desktop.sh
 
-RUN mkdir /project && mkdir /tmp/.ssh && mkdir /home/deadlock/mission
+RUN mkdir /project && mkdir /deadlock/.ssh && mkdir /home/deadlock/mission
 
 RUN chown deadlock:deadlock /home/deadlock
 
diff --git a/deadlock-plugins/deadlock-extension/src/core/gitMission.ts b/deadlock-plugins/deadlock-extension/src/core/gitMission.ts
index 12eb5c78995bcf515e489784ae761b83a91ddc66..b7169e6781217a062b7810b739cd1e7fccc667b5 100644
--- a/deadlock-plugins/deadlock-extension/src/core/gitMission.ts
+++ b/deadlock-plugins/deadlock-extension/src/core/gitMission.ts
@@ -45,7 +45,7 @@ export default class GitMission {
   async setupSshAgent() {
     try {
       const gitea = await ApiService.instance.getGiteaPublicProperties();
-      await exec(`ssh-add /tmp/.ssh/id_rsa`);
+      await exec(`ssh-add /deadlock/.ssh/id_rsa`);
       await exec(`eval "$(ssh-agent -s)" && ssh-keyscan -p ${gitea.sshPort} -H ${gitea.sshHost} >> ~/.ssh/known_hosts`);
     } catch (err) {
       this.log(err);
@@ -62,7 +62,7 @@ export default class GitMission {
   }
 
   async forgetSshKeys() {
-    await exec(`ssh-add -d /tmp/.ssh/id_rsa`);
+    await exec(`ssh-add -d /deadlock/.ssh/id_rsa`);
   }
 
   async getAuthor(): Promise<string> {
diff --git a/deadlock-plugins/deadlock-extension/src/core/mission/missionDevContainer.ts b/deadlock-plugins/deadlock-extension/src/core/mission/missionDevContainer.ts
index e47003ce57b202ba0279a548d9fffb7288fcec85..aeee097348b6c1be25b12099d889b37eca4e5f5b 100644
--- a/deadlock-plugins/deadlock-extension/src/core/mission/missionDevContainer.ts
+++ b/deadlock-plugins/deadlock-extension/src/core/mission/missionDevContainer.ts
@@ -108,7 +108,7 @@ export class MissionDevContainer {
   private async setupMounts() {
     this.mounts.splice(0, this.mounts.length);
     this.mounts.push(
-      `source=${userSshKeyFolderPath},target=/tmp/.ssh,type=bind,consistency=cached,readonly`,
+      `source=${userSshKeyFolderPath},target=/deadlock/.ssh,type=bind,consistency=cached,readonly`,
       `source=${UserMission.getMissionUserFolder(
         this.missionId,
         this.revieweeId,
diff --git a/start.desktop.sh b/start.desktop.sh
index 135010df39b1f6109edc9e25157437b598ca5baa..71ac99547627c93126d6cf30b3c63833feeb12eb 100644
--- a/start.desktop.sh
+++ b/start.desktop.sh
@@ -3,11 +3,6 @@
 ON_START_UP_FILE="/deadlock/startup.sh"
 TAG="[DEADLOCK]"
 
-# setup ssh key for root user
-# must be installed by the API first within /tmp/.ssh
-mkdir ~/.ssh
-cp /tmp/.ssh/* ~/.ssh/
-
 # start init mission script if exists
 if [ -f "$ON_START_UP_FILE" ]; then
     echo