diff --git a/execution/helm/theodolite-chart/templates/kafka-client.yaml b/execution/helm/theodolite-chart/templates/kafka-client.yaml
index f0dc094328e7d5629a5d5228fc74e9ae329764c7..5f0ec73038497a116e755c454d16e0daeaabb402 100644
--- a/execution/helm/theodolite-chart/templates/kafka-client.yaml
+++ b/execution/helm/theodolite-chart/templates/kafka-client.yaml
@@ -11,7 +11,7 @@ spec:
       - sh
       - -c
       - "exec tail -f /dev/null"
-  {{- with .Values.nodeSelector }}
+  {{- with .Values.kafkaClient.nodeSelector }}
   nodeSelector:
     {{- toYaml . | nindent 8 }}
   {{- end }}
diff --git a/execution/helm/theodolite-chart/templates/prometheus.yaml b/execution/helm/theodolite-chart/templates/prometheus.yaml
index d44fcae912b0014603e2b4f3df9a4a6f5a8d00a3..0642ab6acd2e016d0e76f07ffb4d06bdb7f2d608 100644
--- a/execution/helm/theodolite-chart/templates/prometheus.yaml
+++ b/execution/helm/theodolite-chart/templates/prometheus.yaml
@@ -14,4 +14,8 @@ spec:
       memory: 400Mi
   #scrapeInterval: 1s
   enableAdminAPI: true
+  {{- with .Values.prometheus.nodeSelector }}
+  nodeSelector:
+    {{- toYaml . | nindent 8 }}
+  {{- end}}
 {{- end}}
\ No newline at end of file
diff --git a/execution/helm/theodolite-chart/templates/zookeeper-client.yaml b/execution/helm/theodolite-chart/templates/zookeeper-client.yaml
index 995703c127ca9eeec011df98ed6792990cc199de..8d246aef6e0e718bc853adca19d2c137a28f61e8 100644
--- a/execution/helm/theodolite-chart/templates/zookeeper-client.yaml
+++ b/execution/helm/theodolite-chart/templates/zookeeper-client.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.ZookeeperClient.enabled -}}
+{{- if .Values.zookeeperClient.enabled -}}
 apiVersion: v1
 kind: Pod
 metadata:
@@ -11,7 +11,7 @@ spec:
       - sh
       - -c
       - "exec tail -f /dev/null"
-  {{- with .Values.nodeSelector }}
+  {{- with .Values.zookeeperClient.nodeSelector }}
   nodeSelector:
     {{- toYaml . | nindent 8 }}
   {{- end }}