diff --git a/nixos/ryu/configuration.nix b/nixos/ryu/configuration.nix
index c677eb6f..0bee28e7 100644
--- a/nixos/ryu/configuration.nix
+++ b/nixos/ryu/configuration.nix
@@ -10,6 +10,7 @@
     ./programs
     ./containers
     ./apps
+    ./vms
   ];
 
   security.tpm2 = {
diff --git a/nixos/ryu/ryu.nix b/nixos/ryu/ryu.nix
index 3c1b5b96..31b37cf8 100644
--- a/nixos/ryu/ryu.nix
+++ b/nixos/ryu/ryu.nix
@@ -58,7 +58,6 @@
     NIXOS_OZONE_WL = "1";
   };
 
-  virtualisation.libvirtd.enable = true;
   users.extraUsers.servius.extraGroups = ["libvirtd" "adbusers" "kvm"];
 
   boot.extraModprobeConfig = ''
diff --git a/nixos/ryu/vms/default.nix b/nixos/ryu/vms/default.nix
index 29f4249c..aa369bba 100644
--- a/nixos/ryu/vms/default.nix
+++ b/nixos/ryu/vms/default.nix
@@ -1,4 +1,16 @@
 {
+  virtualisation = {
+    libvirtd = {
+      enable = true;
+      qemu = {
+        runAsRoot = true;
+        swtpm.enable = true;
+        ovmf = {
+          enable = true;
+        };
+      };
+    };
+  };
   imports = [
     ./win11.nix
   ];
diff --git a/nixos/ryu/vms/win11.nix b/nixos/ryu/vms/win11.nix
index f96a1ea1..deb3e545 100644
--- a/nixos/ryu/vms/win11.nix
+++ b/nixos/ryu/vms/win11.nix
@@ -4,10 +4,6 @@
   lib,
   ...
 }: {
-  virtualisation.libvirtd.enable = true;
-  virtualisation.libvirtd.qemu.ovmf.enable = true;
-  virtualisation.libvirtd.qemu.swtpm.enable = true;
-
   # IOMMU and VFIO settings
   # boot.kernelParams = [
   #   "amd_iommu=on" # Use "intel_iommu=on" for Intel CPUs