diff --git a/nixosModules/installer/default.nix b/nixosModules/installer/default.nix
index 6e161dbb..97fc385f 100644
--- a/nixosModules/installer/default.nix
+++ b/nixosModules/installer/default.nix
@@ -16,6 +16,7 @@
     (modulesPath + "/profiles/installation-device.nix")
     (modulesPath + "/profiles/all-hardware.nix")
     (modulesPath + "/profiles/base.nix")
+    (modulesPath + "/installer/cd-dvd/iso-image.nix")
   ];
   services.openssh.settings.PermitRootLogin = "yes";
   system.activationScripts.root-password = ''
@@ -64,50 +65,5 @@
       cat /var/shared/qrcode.utf8
     fi
   '';
-
-  # boot.loader.systemd-boot.enable = true;
-
-  # Grub doesn't find devices for both BIOS and UEFI?
-  # Mic92: Please write where this exactly breaks if you want to comment out grub again.
-  # NOTE: We need grub here. Otherwise, the system won't boot in some machines.
-  # example: Lenovo E495 didn't boot without grub.
-  boot.loader.grub.efiInstallAsRemovable = true;
-  boot.loader.grub.efiSupport = true;
-
-  disko.devices = {
-    disk = {
-      stick = {
-        type = "disk";
-        device = "/vda";
-        imageSize = "3G";
-        content = {
-          type = "gpt";
-          partitions = {
-            boot = {
-              priority = 1;
-              size = "1M";
-              type = "EF02"; # for grub MBR
-            };
-            ESP = {
-              size = "100M";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-              };
-            };
-            root = {
-              size = "100%";
-              content = {
-                type = "filesystem";
-                format = "ext4";
-                mountpoint = "/";
-              };
-            };
-          };
-        };
-      };
-    };
-  };
+  isoImage.squashfsCompression = "zstd";
 }