diff --git a/nomad-job/backup-consul.nomad b/nomad-job/backup-consul.nomad
index ad46ac7..d26ad86 100644
--- a/nomad-job/backup-consul.nomad
+++ b/nomad-job/backup-consul.nomad
@@ -6,7 +6,11 @@ job "backup-consul" {
   meta {
     forcedeploy = "0"
   }
-
+  constraint {
+    attribute = "${node.class}"
+    operator = "set_contains"
+    value = "cluster"
+  }
   constraint {
     attribute = "${attr.cpu.arch}"
     value     = "amd64"
@@ -24,7 +28,7 @@ job "backup-consul" {
       config {
         image = "ducampsv/docker-consul-backup:latest"
         volumes = [
-          "/mnt/diskstation/backup/consul:/backup"
+          "/mnt/diskstation/nomad/backup/consul:/backup"
         ]
       }
       resources {
diff --git a/nomad-job/backup-postgress.nomad b/nomad-job/backup-postgress.nomad
index ac0d4c0..1fbe225 100644
--- a/nomad-job/backup-postgress.nomad
+++ b/nomad-job/backup-postgress.nomad
@@ -6,7 +6,11 @@ job "backup-postgress" {
   meta {
     forcedeploy = "0"
   }
-
+  constraint {
+    attribute = "${node.class}"
+    operator = "set_contains"
+    value = "cluster"
+  }
   constraint {
     attribute = "${attr.cpu.arch}"
     value     = "amd64"
@@ -30,7 +34,7 @@ job "backup-postgress" {
       config {
         image = "ducampsv/docker-backup-postgres:latest"
         volumes = [
-          "/mnt/diskstation/backup/postgres:/backup"
+          "/mnt/diskstation/nomad/backup/postgres:/backup"
         ]
       }
       template {
diff --git a/nomad-job/backup-vault.nomad b/nomad-job/backup-vault.nomad
index cd2c61e..4e47764 100644
--- a/nomad-job/backup-vault.nomad
+++ b/nomad-job/backup-vault.nomad
@@ -6,7 +6,11 @@ job "backup-vault" {
   meta {
     forcedeploy = "0"
   }
-
+  constraint {
+    attribute = "${node.class}"
+    operator = "set_contains"
+    value = "cluster"
+  }
   constraint {
     attribute = "${attr.cpu.arch}"
     value     = "amd64"
@@ -27,7 +31,7 @@ job "backup-vault" {
       config {
         image = "ducampsv/docker-vault-backup:latest"
         volumes = [
-          "/mnt/diskstation/backup/vault:/backup"
+          "/mnt/diskstation/nomad/backup/vault:/backup"
         ]
       }
       template {