diff --git a/helm/templates/theodolite/random-scheduler/deployment.yaml b/helm/templates/theodolite/random-scheduler/deployment.yaml
index 55b6e4ad5f8fafccc9623e69ef1df1fccf81ed39..132c5dcf86b9bf6213ac0db6cc03fb1dbadbc2cd 100644
--- a/helm/templates/theodolite/random-scheduler/deployment.yaml
+++ b/helm/templates/theodolite/random-scheduler/deployment.yaml
@@ -27,4 +27,8 @@ spec:
           env:
             - name: TARGET_NAMESPACE
               value: {{ .Release.Namespace }}
+      {{- with .Values.randomScheduler.nodeSelector }}
+      nodeSelector:
+      {{ toYaml . | indent 2 }}
+      {{- end }}
 {{- end }}
diff --git a/helm/templates/theodolite/theodolite-operator.yaml b/helm/templates/theodolite/theodolite-operator.yaml
index 3d1d186306a5d1103a921b4c39e1425621548db8..98e0688f79b0b2ab0a5c9c83f098c7dc545cafc5 100644
--- a/helm/templates/theodolite/theodolite-operator.yaml
+++ b/helm/templates/theodolite/theodolite-operator.yaml
@@ -132,4 +132,8 @@ spec:
         configMap:
           name: benchmark-resources-custom
           optional: true
+      {{- with .Values.operator.nodeSelector }}
+      nodeSelector:
+      {{ toYaml . | indent 2 }}
+      {{- end }}
 {{- end }}
diff --git a/helm/values.yaml b/helm/values.yaml
index 6c20f4bab35825e66412381b454df5c9dedec0fc..5cdb9ddbd5273ece21d32dbc7e1d2ea757248384 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -3,7 +3,7 @@
 ###
 
 kafkaClient:
-  enabled: true
+  enabled: false
   nodeSelector: {}
   
 
@@ -253,6 +253,8 @@ operator:
   imageTag: latest
   imagePullPolicy: Always
 
+  nodeSelector: {}
+
   sloChecker:
     lagTrend:
       enabled: true
@@ -295,3 +297,4 @@ randomScheduler:
     create: true
   serviceAccount:
     create: true
+  nodeSelector: {}