diff --git a/bin/install b/bin/install
index 1de1bd7e5d7abddc150c9501c599b57b9a484d18..94dc4f58e52d30f1fdc2f00de08abfbba3d77cf1 100755
--- a/bin/install
+++ b/bin/install
@@ -90,11 +90,11 @@ nix copy --file "$nixos_system_file" --argstr hostname "$hostname" --to ssh://ro
 nixos_config_path=$(realpath "$local_temp_dir/nixos-config-$hostname")
 
 ssh root@$via_host "nixos-install --system $nixos_config_path && sync"
-ssh root@$via_host mkdir --mode u=rwx,g=,o= --parents /mnt/secrets/passwords
+ssh root@$via_host mkdir --mode u=rwx,g=,o= --parents /mnt/etc/secrets/passwords
 
 # TODO: get host-specific password
-#scp -r notThePassword root@$via_host:/mnt/secrets/passwords/root
-#scp -r notThePassword root@$via_host:/mnt/secrets/passwords/jens
+#scp -r notThePassword root@$via_host:/mnt/etc/secrets/passwords/root
+#scp -r notThePassword root@$via_host:/mnt/etc/secrets/passwords/jens
 
 ssh root@$via_host sync
 
diff --git a/bin/install-mounted b/bin/install-mounted
index 75339bed4a336a8a230eefc55142c6801dd71019..8496e97bfd299d27e4eb353e4934e238a356c0a6 100755
--- a/bin/install-mounted
+++ b/bin/install-mounted
@@ -45,11 +45,11 @@ nix copy --file "$nixos_system_file" --argstr hostname "$hostname" --to ssh://ro
 nixos_config_path=$(realpath "$local_temp_dir/nixos-config-$hostname")
 
 ssh root@$via_host "nixos-install --system $nixos_config_path && sync"
-ssh root@$via_host mkdir --mode u=rwx,g=,o= --parents /mnt/secrets/passwords
+ssh root@$via_host mkdir --mode u=rwx,g=,o= --parents /mnt/etc/secrets/passwords
 
 # TODO: get host-specific password
-#scp -r notThePassword root@$via_host:/mnt/secrets/passwords/root
-#scp -r notThePassword root@$via_host:/mnt/secrets/passwords/jens
+#scp -r notThePassword root@$via_host:/mnt/etc/secrets/passwords/root
+#scp -r notThePassword root@$via_host:/mnt/etc/secrets/passwords/jens
 
 ssh root@$via_host sync
 
diff --git a/nixos/layers/base.nix b/nixos/layers/base.nix
index 53184351b519e4d8dc262800ddf8ec82981c68a3..0e70f2119a3883bcaae1f8786074fbba8136c733 100644
--- a/nixos/layers/base.nix
+++ b/nixos/layers/base.nix
@@ -77,12 +77,12 @@
     mutableUsers = false;
     defaultUserShell = pkgs.zsh;
     users.root = {
-      passwordFile = "/secrets/passwords/root";
+      passwordFile = "/etc/secrets/passwords/root";
     };
     users.jens = {
       uid = 1000;
       isNormalUser = true;
-      passwordFile = "/secrets/passwords/jens";
+      passwordFile = "/etc/secrets/passwords/jens";
       extraGroups = [ "wheel" "audio" "dialout" ];
     };
   };
diff --git a/nixos/layers/steam.nix b/nixos/layers/steam.nix
index 78160cbc87e095d90febcb6db82d7cbe9dc24041..6e7efcf3892114271bafc2203fbca794f4fd36e6 100644
--- a/nixos/layers/steam.nix
+++ b/nixos/layers/steam.nix
@@ -16,7 +16,7 @@ in
   users.users.steam = {
     isNormalUser = true;
     uid = 1100;
-    passwordFile = "/secrets/passwords/steam";
+    passwordFile = "/etc/secrets/passwords/steam";
     extraGroups = [ "audio" "input" ];
     packages = [
       customSteam