diff --git a/hosts/alpha/network.nix b/hosts/alpha/network.nix
index b582fcf..b941816 100644
--- a/hosts/alpha/network.nix
+++ b/hosts/alpha/network.nix
@@ -70,7 +70,7 @@
           wireguardPeerConfig = {
             PublicKey = "sigmaH/DKSU8KWyrPtucYmS2ewUvDvCNLxd/qYEo0n0=";
             PresharedKeyFile = config.age.secrets.wireguard-preshared-key-file.path;
-            AllowedIPs = ["${secrets.alpha.sigma-p2p-ip-address}/32"];
+            AllowedIPs = ["${secrets.hosts.alpha.sigma-p2p-ip-address}/32"];
             RouteTable = "main";
           };
         }
diff --git a/hosts/sigma/caddy.nix b/hosts/sigma/caddy.nix
index abc8a3a..6688def 100644
--- a/hosts/sigma/caddy.nix
+++ b/hosts/sigma/caddy.nix
@@ -1,5 +1,5 @@
 {secrets, ...}: {
-  services.caddy.virtualHosts = secrets.sigma.caddy.virtualHosts;
+  services.caddy.virtualHosts = secrets.hosts.sigma.caddy.virtualHosts;
 
   # Add caddy to the 'torrent' group to allow viewing downloads
   users.groups.torrent.members = ["caddy"];
diff --git a/hosts/sigma/deluge.nix b/hosts/sigma/deluge.nix
index 8680afb..309a009 100644
--- a/hosts/sigma/deluge.nix
+++ b/hosts/sigma/deluge.nix
@@ -18,7 +18,7 @@
     config = {
       download_location = "/srv/torrents/downloads/";
       # use the dedicated network interface and port
-      listen_interface = secrets.sigma.sigma-p2p-ip-address;
+      listen_interface = secrets.hosts.sigma.sigma-p2p-ip-address;
       outgoing_interface = "wg-sigma-p2p";
       random_port = false;
       listen_ports = [60881];
diff --git a/hosts/sigma/mail.nix b/hosts/sigma/mail.nix
index 766a9d8..db1b734 100644
--- a/hosts/sigma/mail.nix
+++ b/hosts/sigma/mail.nix
@@ -75,7 +75,7 @@
     loginAccounts = {
       "casper@vkristensen.dk" = {
         hashedPasswordFile = config.age.secrets.mail-hashed-password-file.path;
-        aliases = secrets.sigma.mail.aliases;
+        aliases = secrets.hosts.sigma.mail.aliases;
       };
     };
   };
diff --git a/hosts/sigma/network.nix b/hosts/sigma/network.nix
index d5e3fbb..a9fbba1 100644
--- a/hosts/sigma/network.nix
+++ b/hosts/sigma/network.nix
@@ -109,7 +109,7 @@
     };
     networks."wg-sigma-p2p" = {
       name = "wg-sigma-p2p";
-      address = ["${secrets.sigma.sigma-p2p-ip-address}/32"];
+      address = ["${secrets.hosts.sigma.sigma-p2p-ip-address}/32"];
       routingPolicyRules = [
         {
           # The deluge systemd service has
@@ -124,7 +124,7 @@
         {
           routingPolicyRuleConfig = {
             Priority = 1000;
-            From = "${secrets.sigma.sigma-p2p-ip-address}/32";
+            From = "${secrets.hosts.sigma.sigma-p2p-ip-address}/32";
             Table = "wg-sigma-p2p";
           };
         }