diff --git a/.github/workflows/demo-server-deploy.yml b/.github/workflows/demo-server-deploy.yml
index 4916303..bec635f 100644
--- a/.github/workflows/demo-server-deploy.yml
+++ b/.github/workflows/demo-server-deploy.yml
@@ -5,7 +5,7 @@ on:
   push:
 
 env:
-  SERVER_USER: thiloho
+  SERVER_USER: root
   SERVER_IP: 128.140.75.240
 
 jobs:
@@ -35,5 +35,3 @@ jobs:
           --build-host ${{ env.SERVER_USER }}@${{ env.SERVER_IP }} \
           --target-host ${{ env.SERVER_USER }}@${{ env.SERVER_IP }} \
           --use-remote-sudo
-      env:
-        GIT_SSH_COMMAND: "ssh -o ForwardAgent=yes"
diff --git a/nix/demo-server/default.nix b/nix/demo-server/default.nix
index 23bb807..5a94687 100644
--- a/nix/demo-server/default.nix
+++ b/nix/demo-server/default.nix
@@ -33,15 +33,15 @@
     };
   };
 
-  security.pam = {
-    sshAgentAuth.enable = true;
-    services.sudo.sshAgentAuth = true;
-  };
-
   users = {
     mutableUsers = false;
     users = {
-      root.hashedPassword = "$y$j9T$MuWDs5Ind6VPEM78u5VTy/$XAuRCaOPtS/8Vj8XgpxB/XX2ygftNLql2VrFWcC/sq7";
+      root = {
+        openssh.authorizedKeys.keys = [
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFE42q8e7egSSTs4YJo8vQFDbRWqrGTQkR1weq8nT0Zx thiloho@pc"
+        ];
+        hashedPassword = "$y$j9T$MuWDs5Ind6VPEM78u5VTy/$XAuRCaOPtS/8Vj8XgpxB/XX2ygftNLql2VrFWcC/sq7";
+      };
       thiloho = {
         isNormalUser = true;
         extraGroups = [
@@ -51,7 +51,6 @@
         hashedPassword = "$y$j9T$Y0ffzVb7wrZSdCKbiYHin0$oahgfFqH/Eep6j6f4iKPETEfGZSOkgu74UT2eyG2uI1";
         openssh.authorizedKeys.keys = [
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBj6+r+vMXJyy5wvQTLyfd2rIw62WCg9eIpwsciHg4ym thiloho@pc"
-          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFE42q8e7egSSTs4YJo8vQFDbRWqrGTQkR1weq8nT0Zx thiloho@pc"
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIgfOa8N46PBUO2gj8UeyrV0R+MRZFnJqUzG132UjaFS thiloho@laptop"
         ];
       };