diff --git a/molgenis-jenkins/values.yaml b/molgenis-jenkins/values.yaml
index 9816fee..48f1411 100644
--- a/molgenis-jenkins/values.yaml
+++ b/molgenis-jenkins/values.yaml
@@ -1,5 +1,7 @@
 jenkins:
   Master:
+    NodeSelector:
+      deployPod: "true"
     HostName: jenkins.molgenis.org
     ServiceType: ClusterIP
     InstallPlugins:
@@ -489,7 +491,9 @@ jenkins:
           Command: cat
           WorkingDir: /home/jenkins
           TTY: true
-      NodeSelector: {}
+      NodeSelector: {
+        deployPod: "true"
+      }
     node:
       Label: node-carbon
       NodeUsageMode: EXCLUSIVE
@@ -519,7 +523,9 @@ jenkins:
               key: VAULT_ADDR
               secretName: molgenis-pipeline-vault-secret
               secretKey: addr
-      NodeSelector: {}
+      NodeSelector: {
+        deployPod: "true"
+      }
     molgenis-it:
       InheritFrom: molgenis
       Label: molgenis-it
@@ -581,7 +587,9 @@ jenkins:
             limits:
               cpu: "1"
               memory: "512Mi"
-      NodeSelector: {}
+      NodeSelector: {
+        deployPod: "true"
+      }
 
 #secret contains configuration for the kubernetes secrets that jenkins can access
 secret:
diff --git a/molgenis-opencpu/templates/deployment.yaml b/molgenis-opencpu/templates/deployment.yaml
index ddb57c7..b2b1cca 100644
--- a/molgenis-opencpu/templates/deployment.yaml
+++ b/molgenis-opencpu/templates/deployment.yaml
@@ -31,5 +31,7 @@ spec:
         ports:
         - containerPort: {{ .service.port }}
       {{- end }}
-
-
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+      {{- end }}
diff --git a/molgenis-opencpu/values.yaml b/molgenis-opencpu/values.yaml
index c21be14..0a1668a 100644
--- a/molgenis-opencpu/values.yaml
+++ b/molgenis-opencpu/values.yaml
@@ -34,7 +34,9 @@ ingress:
   - name: opencpu.molgenis.org
   tls: []
 
-nodeSelector: {}
+nodeSelector: {
+  deployPod: "true"
+}
 
 tolerations: []
 
diff --git a/molgenis-vault/README.md b/molgenis-vault/README.md
index 5ebac64..da2e77a 100644
--- a/molgenis-vault/README.md
+++ b/molgenis-vault/README.md
@@ -38,7 +38,7 @@ Parameter | Description | Default
 `ui.image.repository` | Vault UI container image repository | `djenriquez/vault-ui`
 `ui.image.tag` | Vault UI container image tag | `latest`
 `ui.resources` | Vault UI pod resource requests & limits | `{}`
-`ui.nodeSelector` | node labels for Vault UI pod assignment | `{}`
+`ui.nodeSelector` | node labels for Vault UI pod assignment | `{deployPod: "true"}`
 `ui.ingress.enabled` | If true, Vault UI Ingress will be created | `true`
 `ui.ingress.annotations` | Vault UI Ingress annotations | `{}`
 `ui.ingress.host` | Vault UI Ingress hostname | `vault.molgenis.org`
diff --git a/molgenis-vault/values.yaml b/molgenis-vault/values.yaml
index aaca8f3..16b76da 100644
--- a/molgenis-vault/values.yaml
+++ b/molgenis-vault/values.yaml
@@ -18,6 +18,10 @@ backupJob:
   # schedule gives the cron schedule for the backup job
   schedule: "0 12 * * 1"
 
+vault-operator:
+  nodeSelector:
+    deployPod: "true"
+
 ###
 # All of the config variables related to setting up the etcd-operator
 # If you want more information about the variables exposed, please visit:
@@ -44,6 +48,8 @@ etcd-operator:
   restoreOperator:
     image:
       tag: v0.9.2
+  nodeSelector:
+    deployPod: "true"
 
 ui:
   name: "vault-ui"
@@ -73,7 +79,8 @@ ui:
     #requests:
     #  cpu: 100m
     #  memory: 128Mi
-  nodeSelector: {}
+  nodeSelector:
+    deployPod: "true"
   vault:
     auth: GITHUB
     url: https://vault.vault-operator:8200
\ No newline at end of file
diff --git a/molgenis/values.yaml b/molgenis/values.yaml
index c9fa30c..72241f7 100644
--- a/molgenis/values.yaml
+++ b/molgenis/values.yaml
@@ -94,9 +94,8 @@ persistence:
   enabled: true
   retain: false
 
-nodeSelector: {
+nodeSelector:
   deployPod: "true"
-}
 
 tolerations: []