diff --git a/flake.lock b/flake.lock
index 6e45d94..f076fab 100644
--- a/flake.lock
+++ b/flake.lock
@@ -318,11 +318,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767024057,
-        "narHash": "sha256-B1aycRjMRvb6QOGbnqDhiDzZwMebj5jxZ5qyJzaKvpI=",
+        "lastModified": 1767619900,
+        "narHash": "sha256-KpoCBPvwHz3gAQtIUkohE2InRBFK3r0/FM6z5SPWfvM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "34578a2fdfce4257ce5f5baf6e7efbd4e4e252b1",
+        "rev": "6bd04da47cfb48dfd15eabf08364b78ad894f5b2",
         "type": "github"
       },
       "original": {
@@ -464,11 +464,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1766568855,
-        "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=",
+        "lastModified": 1767185284,
+        "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80",
+        "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe",
         "type": "github"
       },
       "original": {
@@ -518,11 +518,11 @@
     },
     "nixpkgs-old-kernel": {
       "locked": {
-        "lastModified": 1766687554,
-        "narHash": "sha256-DegN7KD/EtFSKXf2jvqL6lvev6GlfAAatYBcRC8goEo=",
+        "lastModified": 1767051569,
+        "narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fd0ca39c92fdb4012ed8d60e1683c26fddadd136",
+        "rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd",
         "type": "github"
       },
       "original": {
@@ -534,11 +534,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1766885793,
-        "narHash": "sha256-P6RVkrM9JLCW6xBjSwHfgTOQ1JwBUma5xe5LI8xAPC0=",
+        "lastModified": 1767480499,
+        "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9ef261221d1e72399f2036786498d78c38185c46",
+        "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92",
         "type": "github"
       },
       "original": {
diff --git a/hosts/boot.nix b/hosts/boot.nix
index 73e8f6c..a186612 100644
--- a/hosts/boot.nix
+++ b/hosts/boot.nix
@@ -34,6 +34,11 @@
           type = lib.types.str;
           description = "The main disk device to use for installation.";
         };
+        useSwap = lib.mkOption {
+          type = lib.types.bool;
+          default = true;
+          description = "Whether to create and use a swap partition.";
+        };
         swapSize = lib.mkOption {
           type = lib.types.str;
           description = "The size of the swap partition.";
@@ -115,7 +120,7 @@
               };
 
               # Swap Partition (size configurable per host)
-              swap = {
+              swap = lib.mkIf config.athenix.host.filesystem.useSwap {
                 name = "swap";
                 label = "swap";
                 size = config.athenix.host.filesystem.swapSize;
diff --git a/hosts/types/nix-zima.nix b/hosts/types/nix-zima.nix
index d065186..40a9cec 100644
--- a/hosts/types/nix-zima.nix
+++ b/hosts/types/nix-zima.nix
@@ -37,7 +37,7 @@
   ];
 
   # ========== Filesystem Configuration ==========
-  athenix.host.filesystem.swapSize = lib.mkDefault "0G";
+  athenix.host.filesystem.useSwap = lib.mkDefault false;
   athenix.host.filesystem.device = lib.mkDefault "/dev/mmcblk0";
   athenix.host.buildMethods = lib.mkDefault [ "installer-iso" ];
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
diff --git a/installer/artifacts.nix b/installer/artifacts.nix
index 087b1d1..3e835b6 100644
--- a/installer/artifacts.nix
+++ b/installer/artifacts.nix
@@ -18,7 +18,7 @@ let
     hostName:
     let
       targetConfig = self.nixosConfigurations.${hostName}.config;
-      targetSystem = targetConfig.system.build.toplevel;
+      targetSystemBuild = targetConfig.system.build;
       diskoScript = targetConfig.system.build.diskoScript;
     in
     nixpkgs.lib.nixosSystem {
@@ -27,7 +27,7 @@ let
         inherit
           inputs
           hostName
-          targetSystem
+          targetSystemBuild
           diskoScript
           ;
         hostPlatform = system;
diff --git a/installer/auto-install.nix b/installer/auto-install.nix
index 0bfc6e2..3a3b792 100644
--- a/installer/auto-install.nix
+++ b/installer/auto-install.nix
@@ -8,7 +8,7 @@
   inputs,
   hostName,
   hostPlatform,
-  targetSystem,
+  targetSystemBuild,
   diskoScript,
   ...
 }:
@@ -17,11 +17,17 @@
     pkgs.git
     pkgs.bashInteractive
     pkgs.curl
-    targetSystem
+    targetSystemBuild.toplevel
   ];
 
   nixpkgs.hostPlatform = hostPlatform;
 
+  nix.settings.experimental-features = "nix-command flakes";
+
+  system.extraDependencies = with targetSystemBuild; [ toplevel etc bootStage2 ];
+
+  isoImage.storeContents = [ targetSystemBuild.toplevel ];
+
   systemd.services.auto-install = {
     description = "Automatic NixOS install for ${hostName}";
     after = [
@@ -44,8 +50,12 @@
       echo ">>> Running disko script..."
       ${diskoScript}
 
-      echo ">>> Running nixos-install..."
-      nixos-install --no-root-passwd --system ${targetSystem}
+      echo ">>> Setting up NixOS..."
+      nixos-install \
+      --system ${targetSystemBuild.toplevel} \
+      --no-root-passwd \
+      --no-channel-copy \
+      --substituters "" 
 
       echo ">>> Done. Rebooting."
       systemctl reboot
diff --git a/inventory.nix b/inventory.nix
index edcbdc8..f292de7 100644
--- a/inventory.nix
+++ b/inventory.nix
@@ -139,6 +139,8 @@
     };
   };
 
+  # ========== ZimaBoard Desktops ==========
+  # Creates: nix-zima1, nix-zima2, nix-zima3
   nix-zima.devices = 3;
 
   # ========== Ephemeral/Netboot System ==========