diff --git a/deployment/check/data-model-tf-proxmox/setups/shared.nix b/deployment/check/data-model-tf-proxmox/setups/shared.nix
index a0c85303..e7b8e9f9 100644
--- a/deployment/check/data-model-tf-proxmox/setups/shared.nix
+++ b/deployment/check/data-model-tf-proxmox/setups/shared.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   sources ? import ../../../../npins,
   ...
 }:
@@ -20,4 +21,50 @@
   users.users.root.openssh.authorizedKeys.keys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFZsldWMEsajYysjYsEpNvMOjO4D8L21pTrfQS1T+Hfy"
   ];
+  boot.loader = {
+    systemd-boot.enable = true;
+    efi = {
+      canTouchEfiVariables = true;
+      efiSysMountPoint = "/boot";
+    };
+    grub.enable = false;
+  };
+  fileSystems."/boot" = {
+    fsType = "vfat";
+    device = lib.mkDefault "/dev/sda1";
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
+  };
+  disko.devices.disk.main = {
+    device = "/dev/sda";
+    type = "disk";
+    imageSize = "20G"; # needed for image generation
+    content = {
+      type = "gpt";
+      partitions = {
+        esp = {
+          priority = 1;
+          size = "500M";
+          type = "EF00";
+          label = "boot";
+          content = {
+            type = "filesystem";
+            format = "vfat";
+            mountpoint = "/boot";
+          };
+        };
+        root = {
+          priority = 2;
+          size = "100%";
+          content = {
+            type = "filesystem";
+            format = "ext4";
+            mountpoint = "/";
+          };
+        };
+      };
+    };
+  };
 }
diff --git a/infra/common/proxmox-qemu-vm.nix b/infra/common/proxmox-qemu-vm.nix
index d59e6ad3..f3efbe00 100644
--- a/infra/common/proxmox-qemu-vm.nix
+++ b/infra/common/proxmox-qemu-vm.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ ... }:
 
 {
   _class = "nixos";
@@ -11,14 +11,6 @@
   # ];
 
   boot = {
-    loader = {
-      systemd-boot.enable = true;
-      efi = {
-        canTouchEfiVariables = true;
-        efiSysMountPoint = "/boot";
-      };
-      grub.enable = false;
-    };
     initrd = {
       availableKernelModules = [
         "ata_piix"
@@ -30,29 +22,19 @@
     };
   };
 
-  fileSystems."/boot" = {
-    fsType = "vfat";
-    device = lib.mkDefault "/dev/sda1";
-    options = [
-      "fmask=0022"
-      "dmask=0022"
-    ];
-  };
-
   disko.devices.disk.main = {
     device = "/dev/sda";
     type = "disk";
-    imageSize = "20G"; # needed for image generation
 
     content = {
       type = "gpt";
 
       partitions = {
-        # mbr = {
-        #   priority = 0;
-        #   size = "1M";
-        #   type = "EF02";
-        # };
+        mbr = {
+          priority = 0;
+          size = "1M";
+          type = "EF02";
+        };
 
         esp = {
           priority = 1;