diff --git a/hosts/zackbiene/home-assistant.nix b/hosts/zackbiene/home-assistant.nix
index c9db282..88a5529 100644
--- a/hosts/zackbiene/home-assistant.nix
+++ b/hosts/zackbiene/home-assistant.nix
@@ -45,7 +45,7 @@
   };
 
   rekey.secrets."home-assistant-secrets.yaml" = {
-    file = ./home-assistant-secrets.yaml.age;
+    file = ./secrets/home-assistant-secrets.yaml.age;
     owner = "hass";
   };
 
diff --git a/hosts/zackbiene/mosquitto.nix b/hosts/zackbiene/mosquitto.nix
index 5f3366f..11cc642 100644
--- a/hosts/zackbiene/mosquitto.nix
+++ b/hosts/zackbiene/mosquitto.nix
@@ -4,13 +4,13 @@
   ...
 }: {
   rekey.secrets.mosquitto-pw-zigbee2mqtt = {
-    file = ./mosquitto-pw-zigbee2mqtt.age;
+    file = ./secrets/mosquitto-pw-zigbee2mqtt.age;
     mode = "440";
     owner = "zigbee2mqtt";
     group = "mosquitto";
   };
   rekey.secrets.mosquitto-pw-home_assistant = {
-    file = ./mosquitto-pw-home_assistant.age;
+    file = ./secrets/mosquitto-pw-home_assistant.age;
     mode = "440";
     owner = "hass";
     group = "mosquitto";
diff --git a/hosts/zackbiene/home-assistant-secrets.yaml.age b/hosts/zackbiene/secrets/home-assistant-secrets.yaml.age
similarity index 100%
rename from hosts/zackbiene/home-assistant-secrets.yaml.age
rename to hosts/zackbiene/secrets/home-assistant-secrets.yaml.age
diff --git a/hosts/zackbiene/initrd_host_ed25519_key.age b/hosts/zackbiene/secrets/initrd_host_ed25519_key.age
similarity index 100%
rename from hosts/zackbiene/initrd_host_ed25519_key.age
rename to hosts/zackbiene/secrets/initrd_host_ed25519_key.age
diff --git a/hosts/zackbiene/mosquitto-pw-home_assistant.age b/hosts/zackbiene/secrets/mosquitto-pw-home_assistant.age
similarity index 100%
rename from hosts/zackbiene/mosquitto-pw-home_assistant.age
rename to hosts/zackbiene/secrets/mosquitto-pw-home_assistant.age
diff --git a/hosts/zackbiene/mosquitto-pw-zigbee2mqtt.age b/hosts/zackbiene/secrets/mosquitto-pw-zigbee2mqtt.age
similarity index 100%
rename from hosts/zackbiene/mosquitto-pw-zigbee2mqtt.age
rename to hosts/zackbiene/secrets/mosquitto-pw-zigbee2mqtt.age
diff --git a/hosts/zackbiene/mosquitto-pw-zigbee2mqtt.yaml.age b/hosts/zackbiene/secrets/mosquitto-pw-zigbee2mqtt.yaml.age
similarity index 100%
rename from hosts/zackbiene/mosquitto-pw-zigbee2mqtt.yaml.age
rename to hosts/zackbiene/secrets/mosquitto-pw-zigbee2mqtt.yaml.age
diff --git a/hosts/zackbiene/zigbee2mqtt.nix b/hosts/zackbiene/zigbee2mqtt.nix
index a3db3f0..63ed989 100644
--- a/hosts/zackbiene/zigbee2mqtt.nix
+++ b/hosts/zackbiene/zigbee2mqtt.nix
@@ -4,7 +4,7 @@
   ...
 }: {
   rekey.secrets."mosquitto-pw-zigbee2mqtt.yaml" = {
-    file = ./mosquitto-pw-zigbee2mqtt.yaml.age;
+    file = ./secrets/mosquitto-pw-zigbee2mqtt.yaml.age;
     mode = "440";
     owner = "zigbee2mqtt";
     group = "mosquitto";