diff --git a/hosts/skipper/default.nix b/hosts/skipper/default.nix
index af60270..9e5b803 100644
--- a/hosts/skipper/default.nix
+++ b/hosts/skipper/default.nix
@@ -5,10 +5,10 @@
     ./services
     ./network
     ./persistence
+    ./virtualisation
     ./plymouth.nix
     ./secureboot.nix
     ./security.nix
-    ./virtualisation.nix
   ];
 
   console.useXkbConfig = true;
diff --git a/hosts/skipper/virtualisation/default.nix b/hosts/skipper/virtualisation/default.nix
new file mode 100644
index 0000000..65331c1
--- /dev/null
+++ b/hosts/skipper/virtualisation/default.nix
@@ -0,0 +1,3 @@
+_: {
+  imports = [ ./libvirtd.nix ./docker.nix ];
+}
diff --git a/hosts/skipper/virtualisation.nix b/hosts/skipper/virtualisation/docker.nix
similarity index 79%
rename from hosts/skipper/virtualisation.nix
rename to hosts/skipper/virtualisation/docker.nix
index e3bbb46..0ea85c8 100644
--- a/hosts/skipper/virtualisation.nix
+++ b/hosts/skipper/virtualisation/docker.nix
@@ -25,15 +25,5 @@
       };
       storageDriver = "btrfs";
     };
-    libvirtd = {
-      enable = true;
-      qemu = {
-        package = pkgs.qemu_kvm;
-        ovmf = {
-          enable = true;
-          packages = [ pkgs.OVMFFull.fd ];
-        };
-      };
-    };
   };
 }
diff --git a/hosts/skipper/virtualisation/libvirtd.nix b/hosts/skipper/virtualisation/libvirtd.nix
new file mode 100644
index 0000000..1b21c57
--- /dev/null
+++ b/hosts/skipper/virtualisation/libvirtd.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }: {
+  virtualisation = {
+    libvirtd = {
+      enable = true;
+      qemu = {
+        package = pkgs.qemu_kvm;
+        ovmf = {
+          enable = true;
+          packages = [ pkgs.OVMFFull.fd ];
+        };
+      };
+    };
+  };
+}