diff --git a/hosts/envy/disko/default.nix b/hosts/envy/disko/default.nix
index 8c7a5613..d5663907 100644
--- a/hosts/envy/disko/default.nix
+++ b/hosts/envy/disko/default.nix
@@ -10,6 +10,10 @@
         content = {
           type = "gpt";
           partitions = {
+            boot = {
+              size = "1M";
+              type = "EF02";
+            };
             ESP = {
               priority = 1;
               size = "2G";
diff --git a/hosts/intuos/disko/default.nix b/hosts/intuos/disko/default.nix
index 093548d1..1c645173 100644
--- a/hosts/intuos/disko/default.nix
+++ b/hosts/intuos/disko/default.nix
@@ -10,6 +10,10 @@
         content = {
           type = "gpt";
           partitions = {
+            boot = {
+              size = "1M";
+              type = "EF02";
+            };
             ESP = {
               priority = 1;
               size = "2G";
diff --git a/hosts/kitty/disko/default.nix b/hosts/kitty/disko/default.nix
index 3d15729b..ba80091b 100644
--- a/hosts/kitty/disko/default.nix
+++ b/hosts/kitty/disko/default.nix
@@ -10,6 +10,10 @@
         content = {
           type = "gpt";
           partitions = {
+            boot = {
+              size = "1M";
+              type = "EF02";
+            };
             ESP = {
               priority = 1;
               size = "2G";
diff --git a/hosts/midas/disko/default.nix b/hosts/midas/disko/default.nix
index f9c1725b..f7cbed70 100644
--- a/hosts/midas/disko/default.nix
+++ b/hosts/midas/disko/default.nix
@@ -10,6 +10,10 @@
         content = {
           type = "gpt";
           partitions = {
+            boot = {
+              size = "1M";
+              type = "EF02";
+            };
             ESP = {
               priority = 1;
               size = "2G";
diff --git a/hosts/pear/disko/default.nix b/hosts/pear/disko/default.nix
index 8c7a5613..d5663907 100644
--- a/hosts/pear/disko/default.nix
+++ b/hosts/pear/disko/default.nix
@@ -10,6 +10,10 @@
         content = {
           type = "gpt";
           partitions = {
+            boot = {
+              size = "1M";
+              type = "EF02";
+            };
             ESP = {
               priority = 1;
               size = "2G";
diff --git a/hosts/prophet/disko/default.nix b/hosts/prophet/disko/default.nix
index 66c8b73c..05a42c9d 100644
--- a/hosts/prophet/disko/default.nix
+++ b/hosts/prophet/disko/default.nix
@@ -10,6 +10,10 @@
         content = {
           type = "gpt";
           partitions = {
+            boot = {
+              size = "1M";
+              type = "EF02";
+            };
             ESP = {
               priority = 1;
               size = "2G";
diff --git a/hosts/qemu/boot/default.nix b/hosts/qemu/boot/default.nix
index a9254f85..1282ad5c 100644
--- a/hosts/qemu/boot/default.nix
+++ b/hosts/qemu/boot/default.nix
@@ -1,10 +1,10 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 {
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
     loader.grub = {
       enable = true;
-      device = "/dev/vda";
+      device = lib.mkForce "/dev/vda";
     };
   };
 }
diff --git a/hosts/qemu/disko/default.nix b/hosts/qemu/disko/default.nix
index 8c7a5613..d54a3a22 100644
--- a/hosts/qemu/disko/default.nix
+++ b/hosts/qemu/disko/default.nix
@@ -6,10 +6,14 @@
     disk = {
       "${config.networking.hostName}" = {
         type = "disk";
-        device = "/dev/nvme0n1";
+        device = "/dev/vda";
         content = {
           type = "gpt";
           partitions = {
+            boot = {
+              size = "1M";
+              type = "EF02";
+            };
             ESP = {
               priority = 1;
               size = "2G";
diff --git a/hosts/qemu/hardware/default.nix b/hosts/qemu/hardware/default.nix
index 71b977b5..0e1bb4c5 100644
--- a/hosts/qemu/hardware/default.nix
+++ b/hosts/qemu/hardware/default.nix
@@ -1,9 +1,6 @@
 { config, lib, modulesPath, ... }:
 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-    (modulesPath + "/virtualisation/qemu-vm.nix")
-  ];
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "sr_mod" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
diff --git a/hosts/qemu/id_ed25519.pub b/hosts/qemu/id_ed25519.pub
deleted file mode 100644
index ae651e2c..00000000
--- a/hosts/qemu/id_ed25519.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAb+aqIyTDcXDH8vMK697zQnYYUjgbUD2tJyknlztE3j
diff --git a/hosts/redmond/disko/default.nix b/hosts/redmond/disko/default.nix
index db24d325..d1a2c0b1 100644
--- a/hosts/redmond/disko/default.nix
+++ b/hosts/redmond/disko/default.nix
@@ -10,6 +10,10 @@
         content = {
           type = "gpt";
           partitions = {
+            boot = {
+              size = "1M";
+              type = "EF02";
+            };
             ESP = {
               priority = 1;
               size = "2G";
diff --git a/hosts/tower/disko/default.nix b/hosts/tower/disko/default.nix
index 8b56d84a..607330a0 100644
--- a/hosts/tower/disko/default.nix
+++ b/hosts/tower/disko/default.nix
@@ -10,6 +10,10 @@
         content = {
           type = "gpt";
           partitions = {
+            boot = {
+              size = "1M";
+              type = "EF02";
+            };
             ESP = {
               priority = 1;
               size = "2G";