diff --git a/machines/nunotaba/configuration.nix b/machines/nunotaba/configuration.nix
index b7d1b79..8269011 100644
--- a/machines/nunotaba/configuration.nix
+++ b/machines/nunotaba/configuration.nix
@@ -13,7 +13,6 @@
     games.enable = true;
     gpu.intel.enable = true;
     gui.enable = true;
-    libvirt.enable = true;
     media-proxy.enable = true;
     restic.enable = true;
     ssd.enable = true;
@@ -24,6 +23,8 @@
     };
   };
 
+  virtualisation.libvirtd.enable = true;
+
   services.tor = {
     enable = true;
     client.enable = true;
diff --git a/machines/sayuri/configuration.nix b/machines/sayuri/configuration.nix
index 707d18b..92f7be4 100644
--- a/machines/sayuri/configuration.nix
+++ b/machines/sayuri/configuration.nix
@@ -13,7 +13,6 @@
     games.enable = true;
     gpu.amd.enable = true;
     gui.enable = true;
-    libvirt.enable = true;
     media-proxy.enable = true;
     restic = {
       enable = true;
@@ -29,6 +28,8 @@
     };
   };
 
+  virtualisation.libvirtd.enable = true;
+
   services.tor = {
     enable = true;
     client.enable = true;
diff --git a/modules/libvirt.nix b/modules/libvirt.nix
index 74080e5..87f7262 100644
--- a/modules/libvirt.nix
+++ b/modules/libvirt.nix
@@ -1,11 +1,9 @@
 { config, lib, pkgs, ... }:
 
 {
-  options.sbruder.libvirt.enable = lib.mkEnableOption "libvirt";
-
   config = {
-    virtualisation.libvirtd.enable = config.sbruder.libvirt.enable;
-
-    environment.systemPackages = lib.mkIf config.sbruder.gui.enable [ pkgs.virt-manager ];
+    environment.systemPackages = lib.mkIf
+      (config.sbruder.gui.enable && config.virtualisation.libvirtd.enable)
+      [ pkgs.virt-manager ];
   };
 }