diff --git a/flake.nix b/flake.nix
index 9732266..cc9a3fe 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,10 +39,7 @@
         system = "x86_64-linux";
         modules = [
           sops-nix.nixosModules.sops
-          ./hosts/cirrus/configuration.nix
-          ./hosts/cirrus/hardware-configuration.nix
-          ./hosts/cirrus/secrets.nix
-          ./hosts/cirrus/wireguard-server.nix
+          ./hosts/cirrus
           ./modules/basic-tools.nix
         ];
       };
@@ -51,10 +48,7 @@
         modules = [
           sops-nix.nixosModules.sops
           microvm.nixosModules.host
-          ./hosts/dishwasher/configuration.nix
-          ./hosts/dishwasher/hardware-configuration.nix
-          ./hosts/dishwasher/oxalab.nix
-          ./hosts/dishwasher/secrets.nix
+          ./hosts/dishwasher
           ./modules/basic-tools.nix
         ];
       };
diff --git a/hosts/cirrus/secrets.nix b/hosts/cirrus/secrets.nix
index 4e768bc..f6da490 100644
--- a/hosts/cirrus/secrets.nix
+++ b/hosts/cirrus/secrets.nix
@@ -4,6 +4,8 @@
   sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
 
   sops.secrets = {
-    "wg/oxalab-seckey" = { };
+    "wg/oxalab-seckey" = {
+      owner = config.users.users.systemd-network.name;
+    };
   };
 }
diff --git a/hosts/dishwasher/secrets.nix b/hosts/dishwasher/secrets.nix
index 679c511..be33eaf 100644
--- a/hosts/dishwasher/secrets.nix
+++ b/hosts/dishwasher/secrets.nix
@@ -4,6 +4,8 @@
   sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
 
   sops.secrets = {
-    "wg/oxalab-seckey" = { };
+    "wg/oxalab-seckey" = {
+      owner = config.users.users.systemd-network.name;
+    };
   };
 }