diff --git a/hosts/common/disks/btrfs-over-legacy-disk.nix b/hosts/common/disks/btrfs-over-mbr-disk.nix
similarity index 86%
rename from hosts/common/disks/btrfs-over-legacy-disk.nix
rename to hosts/common/disks/btrfs-over-mbr-disk.nix
index 07d1ffd..32ee2c4 100644
--- a/hosts/common/disks/btrfs-over-legacy-disk.nix
+++ b/hosts/common/disks/btrfs-over-mbr-disk.nix
@@ -12,15 +12,16 @@
         type = "disk";
         device = disk;
         content = {
-          type = "table";
-          format = "gpt";
+          type = "gpt";
           partitions = {
-            ESP = {
+            MBR = {
+              type = "EF02";
+              size = "1M";
               priority = 1;
-              name = "ESP";
-              start = "1M";
-              end = "512M";
-              bootable = true;
+            };
+            ESP = {
+              type = "EF00";
+              size = "500M";
               content = {
                 type = "filesystem";
                 format = "vfat";
@@ -30,8 +31,6 @@
             };
             root = {
               size = "100%";
-              part-type = "primary";
-              bootable = true;
               content = {
                 type = "btrfs";
                 extraArgs = ["-f"]; # Override existing partition
diff --git a/hosts/nixos/Michishirube/default.nix b/hosts/nixos/Michishirube/default.nix
index ca3ea87..1a3c8d0 100644
--- a/hosts/nixos/Michishirube/default.nix
+++ b/hosts/nixos/Michishirube/default.nix
@@ -14,11 +14,12 @@ in {
   imports = lib.flatten [
     # Disks
     inputs.disko.nixosModules.disko
-    (lib.custom.relativeToRoot "hosts/common/disks/btrfs-disk.nix")
+    (lib.custom.relativeToRoot "hosts/common/disks/btrfs-over-mbr-disk.nix")
     {
       _module.args = {
         disk = "/dev/sda";
         withSwap = false;
+        swapSize = "0";
       };
     }
     # Misc
@@ -49,6 +50,10 @@ in {
   };
 
   boot.loader = {
-    grub.device = "/dev/sda1";
+    limine = {
+      enable = true;
+      biosSupport = true;
+      biosDevice = "/dev/sda";
+    };
   };
 }