diff --git a/hosts/vm.nix b/hosts/common-vm.nix
similarity index 92%
rename from hosts/vm.nix
rename to hosts/common-vm.nix
index 2c42748..835a9eb 100644
--- a/hosts/vm.nix
+++ b/hosts/common-vm.nix
@@ -25,5 +25,7 @@
       interface = "ens3"; # TODO: use correct interface name
     };
   };
+
+  virtualisation.qemu.guestAgent.enable = true;
 }
 
diff --git a/hosts/control-plane-01/default.nix b/hosts/control-plane-01/default.nix
index dc3466c..794576f 100644
--- a/hosts/control-plane-01/default.nix
+++ b/hosts/control-plane-01/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../common.nix
-    ../vm.nix
+    ../common-vm.nix
     ../../services/openssh.nix
     ../../services/etcd.nix
   ];
diff --git a/hosts/control-plane-02/default.nix b/hosts/control-plane-02/default.nix
index dc3466c..794576f 100644
--- a/hosts/control-plane-02/default.nix
+++ b/hosts/control-plane-02/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../common.nix
-    ../vm.nix
+    ../common-vm.nix
     ../../services/openssh.nix
     ../../services/etcd.nix
   ];
diff --git a/hosts/control-plane-03/default.nix b/hosts/control-plane-03/default.nix
index dc3466c..794576f 100644
--- a/hosts/control-plane-03/default.nix
+++ b/hosts/control-plane-03/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../common.nix
-    ../vm.nix
+    ../common-vm.nix
     ../../services/openssh.nix
     ../../services/etcd.nix
   ];
diff --git a/hosts/kaede/default.nix b/hosts/kaede/default.nix
index 392d917..8469dc8 100644
--- a/hosts/kaede/default.nix
+++ b/hosts/kaede/default.nix
@@ -58,17 +58,12 @@
     { device = "/dev/disk/by-uuid/5b53c0b9-ab57-4992-8e81-957e19c7b685"; }
   ];
 
-  virtualisation = {
-    useEFIBoot = true;
-    libvirtd = {
-      enable = true;
-      nss.enableGuest = true;
-      startDelay = 1;
-      onShutdown = "shutdown";
-    };
+  virtualisation.libvirtd = {
+    enable = true;
+    nss.enableGuest = true;
+    startDelay = 1;
+    onShutdown = "shutdown";
   };
-  #rootDevice = "/dev/disk/by-label/nixos";
-  #mountHostNixStore = true;
 
   services.openssh.banner  = ''
              __    __         __
diff --git a/hosts/worker-01/default.nix b/hosts/worker-01/default.nix
index dc3466c..794576f 100644
--- a/hosts/worker-01/default.nix
+++ b/hosts/worker-01/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../common.nix
-    ../vm.nix
+    ../common-vm.nix
     ../../services/openssh.nix
     ../../services/etcd.nix
   ];
diff --git a/hosts/worker-02/default.nix b/hosts/worker-02/default.nix
index dc3466c..794576f 100644
--- a/hosts/worker-02/default.nix
+++ b/hosts/worker-02/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../common.nix
-    ../vm.nix
+    ../common-vm.nix
     ../../services/openssh.nix
     ../../services/etcd.nix
   ];
diff --git a/hosts/worker-03/default.nix b/hosts/worker-03/default.nix
index dc3466c..794576f 100644
--- a/hosts/worker-03/default.nix
+++ b/hosts/worker-03/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../common.nix
-    ../vm.nix
+    ../common-vm.nix
     ../../services/openssh.nix
     ../../services/etcd.nix
   ];
diff --git a/hosts/worker-04/default.nix b/hosts/worker-04/default.nix
index dc3466c..794576f 100644
--- a/hosts/worker-04/default.nix
+++ b/hosts/worker-04/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../common.nix
-    ../vm.nix
+    ../common-vm.nix
     ../../services/openssh.nix
     ../../services/etcd.nix
   ];
diff --git a/hosts/worker-05/default.nix b/hosts/worker-05/default.nix
index dc3466c..794576f 100644
--- a/hosts/worker-05/default.nix
+++ b/hosts/worker-05/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../common.nix
-    ../vm.nix
+    ../common-vm.nix
     ../../services/openssh.nix
     ../../services/etcd.nix
   ];