diff --git a/machines/ci-runner/hardware-configuration.nix b/machines/ci-runner/hardware-configuration.nix
index a5db70a..651d10f 100644
--- a/machines/ci-runner/hardware-configuration.nix
+++ b/machines/ci-runner/hardware-configuration.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-{ lib, modulesPath, ... }:
+{ modulesPath, ... }:
 
 {
   imports = [
@@ -12,54 +12,33 @@
   sbruder.machine.isVm = true;
 
   boot = {
-    kernelModules = [ ];
+    kernelModules = [ "kvm-intel" ];
     extraModulePackages = [ ];
-    kernelParams = [ "ip=dhcp" ];
+    kernelParams = [ ];
     initrd = {
-      availableKernelModules = [ "aesni_intel" "ahci" "sd_mod" "sr_mod" "virtio_net" "virtio_pci" "xhci_pci" ];
+      availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk" ];
       kernelModules = [ ];
-      network = {
-        enable = true; # remote unlocking
-        # For some reason, the DHCP server does not transmit the static route to the gateway in a form udhcpc understands.
-        # This works around this, but is arguably quite hacky.
-        postCommands = ''
-          ip route add 85.215.73.1 dev eth0
-          ip route add default via 85.215.73.1 dev eth0
-        '';
-      };
-      luks.devices."root".device = "/dev/disk/by-uuid/d166ff83-dcc6-4700-95b5-bffae202d985";
     };
-    loader.grub.device = "/dev/vda";
+    loader = {
+      grub.enable = false;
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
   };
 
   fileSystems = {
     "/" = {
-      device = "/dev/disk/by-uuid/3c91488f-0505-4df6-bf76-96a539dcc27a";
+      device = "/dev/disk/by-uuid/e1a9b0bb-9f04-498c-ac2f-aad9da4639f3";
       fsType = "btrfs";
       options = [ "compress=zstd" "discard" "noatime" "ssd" ]; # for some reason, the kernel assumes rotational
     };
     "/boot" = {
-      device = "/dev/disk/by-uuid/f271b335-9174-47a9-bcca-04ce59ce5708";
-      fsType = "ext2";
+      device = "/dev/disk/by-uuid/7A51-7897";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
     };
   };
 
-  swapDevices = [
-    {
-      device = "/dev/disk/by-partuuid/5edbf393-b83e-4d3f-82d1-f07870df40ed";
-      randomEncryption.enable = true;
-    }
-  ];
-
-  zramSwap = {
-    enable = true;
-    memoryPercent = 150;
-  };
-
-  networking = {
-    useDHCP = false;
-    usePredictableInterfaceNames = false;
-  };
   systemd.network = {
     enable = true;
     networks = {