diff --git a/flake.nix b/flake.nix
index 27e5fd9..deb9953 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,6 +27,62 @@
           inputs.home-manager.nixosModules.default
         ];
       };
+      nixosConfigurations.cap-clust-02 = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./hosts/cap-clust-02/configuration.nix
+          inputs.home-manager.nixosModules.default
+        ];
+      };
+      nixosConfigurations.cap-clust-03 = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./hosts/cap-clust-03/configuration.nix
+          inputs.home-manager.nixosModules.default
+        ];
+      };
+      nixosConfigurations.cap-clust-04 = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./hosts/cap-clust-04/configuration.nix
+          inputs.home-manager.nixosModules.default
+        ];
+      };
+      nixosConfigurations.cap-clust-05 = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./hosts/cap-clust-05/configuration.nix
+          inputs.home-manager.nixosModules.default
+        ];
+      };
+      nixosConfigurations.cap-clust-06 = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./hosts/cap-clust-06/configuration.nix
+          inputs.home-manager.nixosModules.default
+        ];
+      };
+      nixosConfigurations.cap-clust-07 = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./hosts/cap-clust-07/configuration.nix
+          inputs.home-manager.nixosModules.default
+        ];
+      };
+      nixosConfigurations.cap-clust-08 = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./hosts/cap-clust-08/configuration.nix
+          inputs.home-manager.nixosModules.default
+        ];
+      };
+      nixosConfigurations.cap-clust-09 = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./hosts/cap-clust-09/configuration.nix
+          inputs.home-manager.nixosModules.default
+        ];
+      };
 
       nixosConfigurations.cap-slim7 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
diff --git a/hosts/cap-clust-02/configuration.nix b/hosts/cap-clust-02/configuration.nix
new file mode 100644
index 0000000..6b30a45
--- /dev/null
+++ b/hosts/cap-clust-02/configuration.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+{
+  imports = [
+    # Hardware Scan
+    ./hardware-configuration.nix
+
+    # Host Groups
+    ../../modules/host-groups/cluster.nix
+  ];
+
+  networking.hostName = "cap-clust-02";
+}
diff --git a/hosts/cap-clust-03/configuration.nix b/hosts/cap-clust-03/configuration.nix
new file mode 100644
index 0000000..837686d
--- /dev/null
+++ b/hosts/cap-clust-03/configuration.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+{
+  imports = [
+    # Hardware Scan
+    ./hardware-configuration.nix
+
+    # Host Groups
+    ../../modules/host-groups/cluster.nix
+  ];
+
+  networking.hostName = "cap-clust-03";
+}
diff --git a/hosts/cap-clust-04/configuration.nix b/hosts/cap-clust-04/configuration.nix
new file mode 100644
index 0000000..268cabe
--- /dev/null
+++ b/hosts/cap-clust-04/configuration.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+{
+  imports = [
+    # Hardware Scan
+    ./hardware-configuration.nix
+
+    # Host Groups
+    ../../modules/host-groups/cluster.nix
+  ];
+
+  networking.hostName = "cap-clust-04";
+}
diff --git a/hosts/cap-clust-05/configuration.nix b/hosts/cap-clust-05/configuration.nix
new file mode 100644
index 0000000..aa49857
--- /dev/null
+++ b/hosts/cap-clust-05/configuration.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+{
+  imports = [
+    # Hardware Scan
+    ./hardware-configuration.nix
+
+    # Host Groups
+    ../../modules/host-groups/cluster.nix
+  ];
+
+  networking.hostName = "cap-clust-05";
+}
diff --git a/hosts/cap-clust-06/configuration.nix b/hosts/cap-clust-06/configuration.nix
new file mode 100644
index 0000000..46f8569
--- /dev/null
+++ b/hosts/cap-clust-06/configuration.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+{
+  imports = [
+    # Hardware Scan
+    ./hardware-configuration.nix
+
+    # Host Groups
+    ../../modules/host-groups/cluster.nix
+  ];
+
+  networking.hostName = "cap-clust-06";
+}
diff --git a/hosts/cap-clust-07/configuration.nix b/hosts/cap-clust-07/configuration.nix
new file mode 100644
index 0000000..4956ce5
--- /dev/null
+++ b/hosts/cap-clust-07/configuration.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+{
+  imports = [
+    # Hardware Scan
+    ./hardware-configuration.nix
+
+    # Host Groups
+    ../../modules/host-groups/cluster.nix
+  ];
+
+  networking.hostName = "cap-clust-07";
+}
diff --git a/hosts/cap-clust-08/configuration.nix b/hosts/cap-clust-08/configuration.nix
new file mode 100644
index 0000000..e120484
--- /dev/null
+++ b/hosts/cap-clust-08/configuration.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+{
+  imports = [
+    # Hardware Scan
+    ./hardware-configuration.nix
+
+    # Host Groups
+    ../../modules/host-groups/cluster.nix
+  ];
+
+  networking.hostName = "cap-clust-08";
+}
diff --git a/hosts/cap-clust-10/hardware-configuration.nix b/hosts/cap-clust-08/hardware-configuration.nix
similarity index 82%
rename from hosts/cap-clust-10/hardware-configuration.nix
rename to hosts/cap-clust-08/hardware-configuration.nix
index 81bb55a..b35edaa 100644
--- a/hosts/cap-clust-10/hardware-configuration.nix
+++ b/hosts/cap-clust-08/hardware-configuration.nix
@@ -30,12 +30,12 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/affec1c2-bf7c-499e-80a6-6615fd163e1a";
+    device = "/dev/disk/by-uuid/30b3183d-8358-46aa-b565-70c7d30af7c7";
     fsType = "ext4";
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/9E1A-C3DA";
+    device = "/dev/disk/by-uuid/BA04-7969";
     fsType = "vfat";
     options = [
       "fmask=0077"
@@ -44,7 +44,7 @@
   };
 
   swapDevices = [
-    { device = "/dev/disk/by-uuid/a17f3a16-78fb-494d-8319-89e31e1defae"; }
+    { device = "/dev/disk/by-uuid/42aeb402-5b5a-4423-b2a5-2c08935c9f57"; }
   ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
diff --git a/hosts/cap-clust-09/configuration.nix b/hosts/cap-clust-09/configuration.nix
new file mode 100644
index 0000000..e2c6c14
--- /dev/null
+++ b/hosts/cap-clust-09/configuration.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+{
+  imports = [
+    # Hardware Scan
+    ./hardware-configuration.nix
+
+    # Host Groups
+    ../../modules/host-groups/cluster.nix
+  ];
+
+  networking.hostName = "cap-clust-09";
+}
diff --git a/hosts/cap-clust-09/hardware-configuration.nix b/hosts/cap-clust-09/hardware-configuration.nix
index b35edaa..81bb55a 100644
--- a/hosts/cap-clust-09/hardware-configuration.nix
+++ b/hosts/cap-clust-09/hardware-configuration.nix
@@ -30,12 +30,12 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/30b3183d-8358-46aa-b565-70c7d30af7c7";
+    device = "/dev/disk/by-uuid/affec1c2-bf7c-499e-80a6-6615fd163e1a";
     fsType = "ext4";
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/BA04-7969";
+    device = "/dev/disk/by-uuid/9E1A-C3DA";
     fsType = "vfat";
     options = [
       "fmask=0077"
@@ -44,7 +44,7 @@
   };
 
   swapDevices = [
-    { device = "/dev/disk/by-uuid/42aeb402-5b5a-4423-b2a5-2c08935c9f57"; }
+    { device = "/dev/disk/by-uuid/a17f3a16-78fb-494d-8319-89e31e1defae"; }
   ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";