diff --git a/machines/configuration.nix b/machines/configuration.nix
index 3515e59..9aa4633 100644
--- a/machines/configuration.nix
+++ b/machines/configuration.nix
@@ -137,7 +137,7 @@ in
     specialArgs.inputs = inputs;
     specialArgs.self = self;
     modules = makeMicroVM "vpn" "10.0.0.10" "D0:E5:CA:F0:D7:E6" [
-      self.nixosModules.malobeo
+      self.nixosModules.malobeo.vpn
       ./vpn/configuration.nix
     ];
   };
diff --git a/outputs.nix b/outputs.nix
index 36bceff..2ad27f3 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -112,11 +112,14 @@ in (utils.lib.eachSystem (builtins.filter filter_system utils.lib.defaultSystems
       self = self;
     });
 
-    nixosModules.malobeo.imports = [
-      ./machines/durruti/host_config.nix
-      ./machines/modules/malobeo/microvm_host.nix
-      ./machines/modules/malobeo/wireguard.nix
-    ];
+    nixosModules.malobeo = {
+      imports = [
+        ./machines/durruti/host_config.nix
+      ];
+
+      microvm.imports = [ ./machines/modules/malobeo/microvm_host.nix ];
+      vpn.imports = [ ./machines/modules/malobeo/wireguard.nix ];
+    };
 
     hydraJobs = nixpkgs.lib.mapAttrs (_: nixpkgs.lib.hydraJob) (
       let