diff --git a/system-config/configuration/homebox/default.nix b/system-config/configuration/homebox/default.nix
index 540ab45..2d3496b 100644
--- a/system-config/configuration/homebox/default.nix
+++ b/system-config/configuration/homebox/default.nix
@@ -29,19 +29,9 @@
     users.users."remote-builder" = lib.mkIf config.sysconfig.remoteBuildHost {
         isNormalUser = true;
         createHome = false;
-        /*openssh.authorizedKeys.keyFiles = [
-            config.sops.secrets."remoteBuildClientKeys/laptop".path
-        ];*/
-        /*openssh.authorizedKeys.keyFiles = (builtins.map 
-            (y: config.sops.secrets.${y}.path) 
-            (builtins.partition 
-                (x: (builtins.match "^remoteBuildClientKeys/.+" x) != null) 
-                (builtins.attrNames config.sops.secrets)
-            ).right
-        );*/
     };
 
-    sops.templates."remote-builder" = {
+    sops.templates."remote-builder" = lib.mkIf config.sysconfig.remoteBuildHost {
         content = builtins.concatStringsSep ''''\n'' (builtins.map 
             (y: config.sops.placeholder.${y}) 
             (builtins.partition 
@@ -53,8 +43,6 @@
         owner = "remote-builder";
     };
 
-    #environment.etc."ssh/authorized_keys.d/remote-builder" = {};
-
   hardware = {
    
    graphics.enable = true;
diff --git a/system-config/secrets.yaml b/system-config/secrets.yaml
index f23aa8c..4b79508 100644
--- a/system-config/secrets.yaml
+++ b/system-config/secrets.yaml
@@ -1,5 +1,6 @@
 remoteBuildClientKeys:
     laptop: ENC[AES256_GCM,data:SZRAZ36nSueWVLcdvpgZpltp/aORqAObFWhgqtIrTYccoK/3F7l0J+VJzF51FASa6spbGJL2BSbzOygyal609pvJc9Hb9bIN85GMzV1P4lha62iC8dkuVLXezPU=,iv:veQJxL4QTxFg2UKm2+I3RQXyuwW2rXEV/gXIQ7nBtlY=,tag:9C9Ltzwz823yY029p9K41A==,type:str]
+    test: ENC[AES256_GCM,data:cdn1f4IqW9SLyB82Y0+RHxes8aVSWFZ5PiAGXDq9JvFmnrb8srHE+eP2+KCs5s6g7HcyLvf7ssVYkBKiV6DHkDPabRUNSrDLDZc1+N1TUAmmHAl5cObw8DPLKdGEsA==,iv:rikXbI8PRtbK6v7tB96Eiia35ex6p/HB7iUMWLe5SAU=,tag:1zfF2XBRt57jNQ0eL9JwaA==,type:str]
 sops:
     age:
         - recipient: age1yqgyp2uxz4lzrc9f9ka0mfjl5fr6ahf8nf24nlmran2wulg6fpvq9hyp9q
@@ -20,7 +21,7 @@ sops:
             S2UxVDJXd2J6NkJYUDVGMnR3VDhqRzQKCj/uuR0vRNjhDpr6D0nRhyxOkBRm6Ruq
             0HOgp2xkNH+q/KEhB1s/hRSae7lNKKi0T35xFPb46DMPkJSFUNdpPw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-08-23T03:42:30Z"
-    mac: ENC[AES256_GCM,data:+q0EeH0W+1Suu6/DDD4Br83RZ4wzWtsh+1BJrrQ1GBdFV55hjQoKigUVqPZMgjIZ2PIYOnKt9IjZhOdA/m5MY7N1Qdj/cPjzLRKM6JxjJEfaSW5EAp2cSC8vVp2zISsSEUh04zvv4Tiwjmzx2urdLHzOd/SK1upvDKNgAQfcDqQ=,iv:cJRH8JaHPex1I+ar9MC6PSwifRITPTr9+Ka7DCOHcaI=,tag:jpyC55iOI2KVHlnGzEpFNg==,type:str]
+    lastmodified: "2025-08-23T16:03:13Z"
+    mac: ENC[AES256_GCM,data:3V/90vYg149eNs1OElXGfeI8LDMSoH8xVEw3jaEkrdaGPeyNCvsB/F94xtmNTZoatXHqde4nf8d7lcWhhXzqctuWHtn9IzA5lNDv5/mi8xrA7QbSFuMwKJ4SnX6lFVCPPb1WlbHrRhO46h/rOeaAry+g7OjiegYb8yu0YbF4iBE=,iv:z9prZBaIDZyl08qFOF7yOghuzzVPbJaJuxyW2xmHuvE=,tag:IhE5+tj5GowSw3uCEXu0uw==,type:str]
     unencrypted_suffix: _unencrypted
     version: 3.10.2