diff --git a/users/glittershark/system/system/default.nix b/users/glittershark/system/system/default.nix
index dd84dc71d..12cde445f 100644
--- a/users/glittershark/system/system/default.nix
+++ b/users/glittershark/system/system/default.nix
@@ -1,4 +1,4 @@
-{ depot, pkgs, ... }:
+args @ { depot, pkgs, ... }:
 
 rec {
   chupacabra = import ./machines/chupacabra.nix;
@@ -7,8 +7,13 @@ rec {
     configuration = chupacabra;
   }).system;
 
+  iso = import ./iso.nix args;
+
   # Build chupacabra in CI
-  meta.targets = [ "chupacabraSystem" ];
+  meta.targets = [
+    "chupacabraSystem"
+    "iso"
+  ];
 
   rebuilder =
     let
diff --git a/users/glittershark/system/system/iso.nix b/users/glittershark/system/system/iso.nix
new file mode 100644
index 000000000..056922ee1
--- /dev/null
+++ b/users/glittershark/system/system/iso.nix
@@ -0,0 +1,17 @@
+{ pkgs, ... }:
+
+let
+  configuration = { ... }: {
+    imports = [
+      "${pkgs.nixpkgsSrc}/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix"
+      "${pkgs.nixpkgsSrc}/nixos/modules/installer/cd-dvd/channel.nix"
+    ];
+
+    networking.networkmanager.enable = true;
+    networking.useDHCP = false;
+    networking.firewall.enable = false;
+    networking.wireless.enable = pkgs.lib.mkForce false;
+  };
+in (pkgs.nixos {
+  inherit configuration;
+}).config.system.build.isoImage