diff --git a/flake.nix b/flake.nix
index 0330ec0..238894f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,6 +8,12 @@
     # Disko for declaratively setting disk formatting
     inputs.disko.url = "github:nix-community/disko";
 
+    # Nixos generators for creating ISOs
+    nixos-generators = {
+      url = "github:nix-community/nixos-generators";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     # Secret management with sops
     sops-nix.url = "github:Mic92/sops-nix";
 
@@ -60,6 +66,7 @@
   outputs = {
     self,
     nixpkgs,
+    nixos-generators,
     home-manager,
     sops-nix,
     simple-nixos-mailserver,
@@ -109,6 +116,22 @@
       };
     };
 
+    # ISO for EDI, can be built using nix build .#EDIISO
+    EDIISO = nixos-generators.nixosGenerate {
+      system = "x86_64-linux";
+      modules = [
+        ./nixos/hosts/EDI/configuration.nix
+        sops-nix.nixosModules.sops
+        lanzaboote.nixosModules.lanzaboote
+        disko.nixosModules.disko
+        home-manager.nixosModules.home-manager
+        {
+          home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager];
+        }
+      ];
+      format = "iso";
+    };
+
     nixosConfigurations = {
       GLaDOS = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix
index 09c442c..ddd08a1 100644
--- a/nixos/desktop/default.nix
+++ b/nixos/desktop/default.nix
@@ -88,7 +88,6 @@
 
     # User tools
     noisetorch
-    nixos-generators
   ];
 
   programs.direnv = {