diff --git a/clusters/fs1/default.nix b/clusters/fs1/default.nix
index 9bec3c9..d201266 100644
--- a/clusters/fs1/default.nix
+++ b/clusters/fs1/default.nix
@@ -1,15 +1,27 @@
-with import <nixpkgs> {};
 let
+  # Pin the deployment package-set to a specific version of nixpkgs
+  # pkgs = import (builtins.fetchTarball {
+  #   url = "https://github.com/NixOS/nixpkgs/archive/e9148dc1c30e02aae80cc52f68ceb37b772066f3.tar.gz";
+  #   sha256 = "1ckzhh24mgz6jd1xhfgx0i9mijk6xjqxwsshnvq789xsavrmsc36";
+  # }) {};
+  pkgs = import <nixpkgs> {};
+
   name = "fs1-0";
   address = "10.1.30.10";
 in {
-  fs1-0 = {
+  fs1-0 = { config, pkgs, ... }: with pkgs; {
+    deployment.tags = [ "fs" ];
     deployment.targetHost = address;
     system.autoUpgrade.enable = lib.mkForce false;
 
     boot = {
       loader.systemd-boot.enable = false;
       loader.efi.canTouchEfiVariables = true;
+      loader.grub = {
+        enable = true;
+        version = 2;
+        device = "/dev/sda1";
+      };
     };
 
     console = {
diff --git a/clusters/fs2/default.nix b/clusters/fs2/default.nix
index 101c4ce..3ff28fa 100644
--- a/clusters/fs2/default.nix
+++ b/clusters/fs2/default.nix
@@ -1,9 +1,15 @@
-with import <nixpkgs> {};
 let
+  # Pin the deployment package-set to a specific version of nixpkgs
+  # pkgs = import (builtins.fetchTarball {
+  #   url = "https://github.com/NixOS/nixpkgs/archive/e9148dc1c30e02aae80cc52f68ceb37b772066f3.tar.gz";
+  #   sha256 = "1ckzhh24mgz6jd1xhfgx0i9mijk6xjqxwsshnvq789xsavrmsc36";
+  # }) {};
+  pkgs = import <nixpkgs> {};
   name = "fs2-0";
   address = "10.1.8.10";
 in {
-  fs2-0 = {
+  fs2-0 = { config, pkgs, ... }: with pkgs; {
+    deployment.tags = [ "fs" ];
     deployment.targetHost = address;
     system.autoUpgrade.enable = lib.mkForce false;
 
diff --git a/clusters/k1/k1.nix b/clusters/k1/k1.nix
index 2669562..443f7f3 100644
--- a/clusters/k1/k1.nix
+++ b/clusters/k1/k1.nix
@@ -34,7 +34,7 @@ in
 {
   network =  {
     inherit pkgs;
-    description = "k0";
+    description = "k1";
     ordering = {
       tags = [ "master" "node" ];
     };
diff --git a/clusters/k2/k2.nix b/clusters/k2/k2.nix
index b975186..f452d68 100644
--- a/clusters/k2/k2.nix
+++ b/clusters/k2/k2.nix
@@ -35,7 +35,7 @@ in
 {
   network =  {
     inherit pkgs;
-    description = "k0";
+    description = "k2";
     ordering = {
       tags = [ "master" "node" ];
     };
diff --git a/clusters/psql1/default.nix b/clusters/psql1/default.nix
index 3d85516..fb2605f 100644
--- a/clusters/psql1/default.nix
+++ b/clusters/psql1/default.nix
@@ -1,9 +1,16 @@
-with import <nixpkgs> {};
 let
+  # Pin the deployment package-set to a specific version of nixpkgs
+  # pkgs = import (builtins.fetchTarball {
+  #   url = "https://github.com/NixOS/nixpkgs/archive/e9148dc1c30e02aae80cc52f68ceb37b772066f3.tar.gz";
+  #   sha256 = "1ckzhh24mgz6jd1xhfgx0i9mijk6xjqxwsshnvq789xsavrmsc36";
+  # }) {};
+  pkgs = import <nixpkgs> {};
+
   name = "psql1-0";
   address = "10.1.30.80";
 in {
-  psql1-0 = {
+  psql1-0 = { config, pkgs, ... }: with pkgs; {
+    deployment.tags = [ "db" ];
     deployment.targetHost = address;
     system.autoUpgrade.enable = lib.mkForce false;
 
diff --git a/clusters/psql2/default.nix b/clusters/psql2/default.nix
index 7a6c321..c02697d 100644
--- a/clusters/psql2/default.nix
+++ b/clusters/psql2/default.nix
@@ -1,9 +1,16 @@
-with import <nixpkgs> {};
 let
+  # Pin the deployment package-set to a specific version of nixpkgs
+  # pkgs = import (builtins.fetchTarball {
+  #   url = "https://github.com/NixOS/nixpkgs/archive/e9148dc1c30e02aae80cc52f68ceb37b772066f3.tar.gz";
+  #   sha256 = "1ckzhh24mgz6jd1xhfgx0i9mijk6xjqxwsshnvq789xsavrmsc36";
+  # }) {};
+  pkgs = import <nixpkgs> {};
+
   name = "psql2-0";
   address = "10.1.8.80";
 in {
-  psql2-0 = {
+  psql2-0 = { config, pkgs, ... }: with pkgs; {
+    deployment.tags = [ "db" ];
     deployment.targetHost = address;
     system.autoUpgrade.enable = lib.mkForce false;