diff --git a/clusters/pi3B_rack.nix b/clusters/pi3B_rack.nix
new file mode 100644
index 0000000..5046ae9
--- /dev/null
+++ b/clusters/pi3B_rack.nix
@@ -0,0 +1,32 @@
+# NixOps configuration for the Raspberry Pi 3B Rack
+
+{
+
+  imports =
+    [
+      <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
+      ../Hardware/raspberry_pi_3_model_B.nix
+      ../Deployments/host_common.nix
+      ../Deployments/pi_common.nix
+    ];
+
+  # Ensure the right package architecture is used
+  nixpkgs.localSystem = {
+    system = "aarch64-linux";
+    config = "aarch64-unknown-linux-gnu";
+    allowUnfree = true;
+  };
+
+  networking.wireless.enable = false;  # Toggles wireless support via wpa_supplicant.
+
+  documentation = {
+    nixos.enable = false;   # Save some space by disabling the manual
+  };
+
+  users.users.root = {
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFq6/C6ZSM8nS091fqw/om9LRszHDmS82ZTL7+GaSBnz craige@pi-tri"
+    ];
+  };
+
+}
diff --git a/deployments/pi3B_rack.nix b/deployments/pi3B_rack.nix
deleted file mode 100644
index 7115ee4..0000000
--- a/deployments/pi3B_rack.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-# NixOps configuration for the Raspberry Pi 3B Rack
-
-{
-  network = {
-    description = "Raspberry Pi 3B Rack";
-  };
-
-  defaults = {
-    imports =
-      [
-        <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
-        ../Hardware/raspberry_pi_3_model_B.nix
-        ../Deployments/host_common.nix
-        ../Deployments/pi_common.nix
-      ];
-
-    # Ensure the right package architecture is used
-    nixpkgs.localSystem = {
-      system = "aarch64-linux";
-      config = "aarch64-unknown-linux-gnu";
-      allowUnfree = true;
-    };
-
-    networking.wireless.enable = false;  # Toggles wireless support via wpa_supplicant.
-
-    documentation = {
-      nixos.enable = false;   # Save some space by disabling the manual
-    };
-
-    users.users.root = {
-      openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFq6/C6ZSM8nS091fqw/om9LRszHDmS82ZTL7+GaSBnz craige@pi-tri"
-      ];
-    };
-
-    system.stateVersion = "19.09"; # Did you read the comment?
-    system.autoUpgrade.enable = true;
-    system.autoUpgrade.channel = https://nixos.org/channels/nixos-19.09;
-
-  };
-
-  pi-tri = {
-    imports = [
-      ../Hosts/pi-tri.nix
-    ];
-    deployment.targetHost = "10.69.0.203";
-  };
-
-  pi-ceithir = {
-    imports = [
-      ../Hosts/pi-ceithir.nix
-    ];
-    deployment.targetHost = "10.69.0.204";
-  };
-
-
-  pi-coig = {
-    imports = [
-      ../Hosts/pi-coig.nix
-    ];
-    deployment.targetHost = "10.69.0.205";
-  };
-
-}