diff --git a/nixos/hosts/nixos-rpi4-01/default.nix b/nixos/hosts/nixos-rpi4-01/default.nix
index b4a46fe7..c0e71731 100644
--- a/nixos/hosts/nixos-rpi4-01/default.nix
+++ b/nixos/hosts/nixos-rpi4-01/default.nix
@@ -36,7 +36,7 @@
 
   # Generic Tailscale configs are in /nixos/common/services/tailscale.nix  
   # Set up the secrets file:
-  sops.secrets.tailscale.nixos-rpi4-01 = {
+  sops.secrets.tailscale_keys.nixos-rpi4-01 = {
     owner = "root";
     sopsFile = ../../../secrets/tailscale.yaml;
     restartUnits = [ 
@@ -44,7 +44,7 @@
       "tailscaled-autoconnect.service" 
     ];
   };
-  services.tailscale.authKeyFile = "/run/secrets/tailscale/nixos-rpi4-01";
+  services.tailscale.authKeyFile = "/run/secrets/tailscale_keys/nixos-rpi4-01";
   services.tailscale.extraUpFlags = [ "--advertise-exit-node" ];
   boot.kernel.sysctl = { "net.ipv4.ip_forward" = true; };
   
diff --git a/nixos/hosts/nixos-rpi4-02/default.nix b/nixos/hosts/nixos-rpi4-02/default.nix
index d329835e..e6c3b5ac 100644
--- a/nixos/hosts/nixos-rpi4-02/default.nix
+++ b/nixos/hosts/nixos-rpi4-02/default.nix
@@ -36,7 +36,7 @@
 
   # Generic Tailscale configs are in /nixos/common/services/tailscale.nix  
   # Set up the secrets file:
-  sops.secrets.tailscale.nixos-rpi4-02 = {
+  sops.secrets.tailscale_keys.nixos-rpi4-02 = {
     owner = "root";
     sopsFile = ../../../secrets/tailscale.yaml;
     restartUnits = [ 
@@ -44,7 +44,7 @@
       "tailscaled-autoconnect.service" 
     ];
   };
-  services.tailscale.authKeyFile = "/run/secrets/tailscale/nixos-rpi4-02";
+  services.tailscale.authKeyFile = "/run/secrets/tailscale_keys/nixos-rpi4-02";
   services.tailscale.extraUpFlags = [ "--advertise-exit-node" ];
   boot.kernel.sysctl = { "net.ipv4.ip_forward" = true; };
   
diff --git a/nixos/hosts/nixos-rpi4-03/default.nix b/nixos/hosts/nixos-rpi4-03/default.nix
index 335f96a0..e6e4ed88 100644
--- a/nixos/hosts/nixos-rpi4-03/default.nix
+++ b/nixos/hosts/nixos-rpi4-03/default.nix
@@ -36,7 +36,7 @@
 
   # Generic Tailscale configs are in /nixos/common/services/tailscale.nix  
   # Set up the secrets file:
-  sops.secrets.tailscale.nixos-rpi4-03 = {
+  sops.secrets.tailscale_keys.nixos-rpi4-03 = {
     owner = "root";
     sopsFile = ../../../secrets/tailscale.yaml;
     restartUnits = [ 
@@ -44,7 +44,7 @@
       "tailscaled-autoconnect.service" 
     ];
   };
-  services.tailscale.authKeyFile = "/run/secrets/tailscale/nixos-rpi4-03";
+  services.tailscale.authKeyFile = "/run/secrets/tailscale_keys/nixos-rpi4-03";
   services.tailscale.extraUpFlags = [ "--advertise-exit-node" ];
   boot.kernel.sysctl = { "net.ipv4.ip_forward" = true; };
   
diff --git a/nixos/hosts/nixos-vm-01/default.nix b/nixos/hosts/nixos-vm-01/default.nix
index 28b7c840..5ed82b0b 100644
--- a/nixos/hosts/nixos-vm-01/default.nix
+++ b/nixos/hosts/nixos-vm-01/default.nix
@@ -29,7 +29,7 @@
 
   # Generic Tailscale configs are in /nixos/common/services/tailscale.nix  
   # Set up the secrets file:
-  sops.secrets.nixos-vm-01_tailscale_key = {
+  sops.secrets.tailscals_keys.nixos-vm-01 = {
     owner = "root";
     sopsFile = ../../../secrets/tailscale.yaml;
     restartUnits = [
@@ -37,6 +37,6 @@
       "tailscaled-autoconnect.service" 
     ];
   };
-  services.tailscale.authKeyFile = "/run/secrets/nixos-vm-01_tailscale_key";
+  services.tailscale.authKeyFile = "/run/secrets/tailscale_keys/nixos-vm-01";
   # networking.firewall.allowedTCPPorts = [ 22 ];
 }