diff --git a/common/dev-node.nix b/common/dev-node.nix
new file mode 100644
index 0000000..4292b9c
--- /dev/null
+++ b/common/dev-node.nix
@@ -0,0 +1,11 @@
+{ pkgs, inputs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    wget
+    deploy-rs
+    docker
+    jq
+  ];
+
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+}
diff --git a/common/nomad-client.nix b/common/nomad-client.nix
new file mode 100644
index 0000000..d93d4cd
--- /dev/null
+++ b/common/nomad-client.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+  services.nomad.enable = false;
+
+  environment.systemPackages = with pkgs; [
+    nomad
+    wander
+    damon
+  ];
+}
diff --git a/flake.lock b/flake.lock
index 9e0ff05..6ab190b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -135,11 +135,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726070115,
-        "narHash": "sha256-vWwTNxTMpK9d0xtZv3n0BWdMuHYF1kQkdN3cJmErU+A=",
+        "lastModified": 1726077552,
+        "narHash": "sha256-I2u/iI8e/pRVtfAs6juLOrPa+zWZjtUzFv3OxemNHfE=",
         "ref": "refs/heads/master",
-        "rev": "31703b82124c15b7be8f094c85576b6c4edc4db4",
-        "revCount": 5,
+        "rev": "0242d6da9aba2ccb530870b944d1837d4cac6b54",
+        "revCount": 6,
         "type": "git",
         "url": "file:/home/ppetru/ppetru-home"
       },
diff --git a/hosts/nix-dev/default.nix b/hosts/nix-dev/default.nix
index 8d26e36..da1d94d 100644
--- a/hosts/nix-dev/default.nix
+++ b/hosts/nix-dev/default.nix
@@ -2,24 +2,15 @@
 {
   imports = [
     ../../common/global
+    ../../common/nomad-client.nix
     ../../common/user-node.nix
+    ../../common/dev-node.nix
     ./hardware.nix
   ];
 
   networking.hostName = "nix-dev";
   services.tailscaleAutoconnect.authkey = "tskey-auth-k6s6VD5CNTRL-3fmjSfzbQ3PHUMyaiML95P8xzmGv5XxYc";
 
-  environment.systemPackages = with pkgs; [
-    wget
-    git
-    nomad
-    deploy-rs
-    docker
-    jq
-  ];
-
   boot.loader.grub.enable = true;
   boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only
-
-  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
 }
diff --git a/hosts/zippy/default.nix b/hosts/zippy/default.nix
index b2355cf..8d47d17 100644
--- a/hosts/zippy/default.nix
+++ b/hosts/zippy/default.nix
@@ -3,6 +3,7 @@
   imports = [ 
     ../../common/global
     ../../common/compute-node.nix
+    ../../common/dev-node.nix
     ./hardware.nix
   ];