diff --git a/modules/hosts/z2w/configuration.nix b/modules/hosts/z2w/configuration.nix
index 1d29838..d8d80c9 100644
--- a/modules/hosts/z2w/configuration.nix
+++ b/modules/hosts/z2w/configuration.nix
@@ -1,11 +1,35 @@
-{ ... }: {
+{ self, ... }: {
 
-    flake.nixosModules.z2w = { ... }: {
+    flake.nixosModules.z2w-install-sd = { config, pkgs, modulesPath, ... }: {
+
+        imports = with self.nixosModules; [
+
+            (modulesPath + "/installer/sd-card/sd-image-aarch64.nix")
+            z2w-core
 
-        imports = [
         ];
 
         config = {
+
+        };
+    };
+
+    flake.nixosModules.z2w = { config, pkgs, ... }: {
+
+        imports = with self.nixosModules; [
+
+            z2w-install-sd
+
+            netbird-sbc
+            remoteBuilds
+            sops
+        ];
+
+        config = {
+
+            sops = {
+                defaultSopsFile = ./secrets.yaml;
+            };
         };
     };
 }
diff --git a/modules/hosts/z2w/default.nix b/modules/hosts/z2w/default.nix
index f7715be..e37ed05 100644
--- a/modules/hosts/z2w/default.nix
+++ b/modules/hosts/z2w/default.nix
@@ -1,16 +1,37 @@
 { self, inputs, ... }: {
+ 
+    perSystem = { ... }: {
+        packages.z2w-sd = self.nixosConfigurations.z2w-install-sd.config.system.build.sdImage;
+    };
 
-    flake.nixosConfigurations."blue-white" = inputs.nixpkgs.lib.nixosSystem {
+    flake.nixosConfigurations.z2w = inputs.nixpkgs.lib.nixosSystem {
 
         system = "aarch64-linux";
 
-        modules = inputs.nixos-opi-zero2w.lib.withOpiZero2wInstallerEssentials [
+        modules = [
             self.nixosModules.z2w
             #self.nixosModules.z2w-hardware
-            #self.diskoConfigurations.z2w
-            ({ ... }: {
-                networking.hostName = "blue-white";
-            })
+            self.diskoConfigurations.z2w
+        ];
+    };
+
+    flake.nixosConfigurations.z2w-install = inputs.nixpkgs.lib.nixosSystem {
+
+        system = "aarch64-linux";
+
+        modules = [
+            self.nixosModules.z2w-core
+            #self.nixosModules.z2w-hardware
+        ];
+    };
+
+    flake.nixosConfigurations.z2w-install-sd = inputs.nixpkgs.lib.nixosSystem {
+
+        system = "aarch64-linux";
+
+        modules = [
+            self.nixosModules.z2w-install-sd
+            #self.nixosModules.z2w-hardware
         ];
     };
 }