diff --git a/services/comms/atlasbot-deployment.yaml b/services/comms/atlasbot-deployment.yaml
index 9593c27f..c3116796 100644
--- a/services/comms/atlasbot-deployment.yaml
+++ b/services/comms/atlasbot-deployment.yaml
@@ -65,6 +65,16 @@ spec:
       serviceAccountName: atlasbot
       nodeSelector:
         hardware: rpi5
+        node-role.kubernetes.io/worker: "true"
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: node-role.kubernetes.io/control-plane
+                    operator: DoesNotExist
+                  - key: node-role.kubernetes.io/master
+                    operator: DoesNotExist
       containers:
         - name: atlasbot
           image: python:3.11-slim
diff --git a/services/comms/coturn.yaml b/services/comms/coturn.yaml
index 9f3c64f0..69882010 100644
--- a/services/comms/coturn.yaml
+++ b/services/comms/coturn.yaml
@@ -54,8 +54,16 @@ spec:
       serviceAccountName: comms-vault
       nodeSelector:
         hardware: rpi5
+        node-role.kubernetes.io/worker: "true"
       affinity:
         nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: node-role.kubernetes.io/control-plane
+                    operator: DoesNotExist
+                  - key: node-role.kubernetes.io/master
+                    operator: DoesNotExist
           preferredDuringSchedulingIgnoredDuringExecution:
             - weight: 50
               preference:
diff --git a/services/comms/guest-name-job.yaml b/services/comms/guest-name-job.yaml
index 3eae2dd2..9eac1a0f 100644
--- a/services/comms/guest-name-job.yaml
+++ b/services/comms/guest-name-job.yaml
@@ -59,6 +59,16 @@ spec:
           serviceAccountName: comms-vault
           nodeSelector:
             hardware: rpi5
+            node-role.kubernetes.io/worker: "true"
+          affinity:
+            nodeAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                nodeSelectorTerms:
+                  - matchExpressions:
+                      - key: node-role.kubernetes.io/control-plane
+                        operator: DoesNotExist
+                      - key: node-role.kubernetes.io/master
+                        operator: DoesNotExist
           volumes:
             - name: vault-scripts
               configMap:
diff --git a/services/comms/livekit-token-deployment.yaml b/services/comms/livekit-token-deployment.yaml
index a23cf62c..64f01090 100644
--- a/services/comms/livekit-token-deployment.yaml
+++ b/services/comms/livekit-token-deployment.yaml
@@ -34,8 +34,16 @@ spec:
             - kit.live.bstein.dev
       nodeSelector:
         hardware: rpi5
+        node-role.kubernetes.io/worker: "true"
       affinity:
         nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: node-role.kubernetes.io/control-plane
+                    operator: DoesNotExist
+                  - key: node-role.kubernetes.io/master
+                    operator: DoesNotExist
           preferredDuringSchedulingIgnoredDuringExecution:
             - weight: 50
               preference:
diff --git a/services/comms/livekit.yaml b/services/comms/livekit.yaml
index 4a5eb8db..a1b3abb9 100644
--- a/services/comms/livekit.yaml
+++ b/services/comms/livekit.yaml
@@ -57,8 +57,16 @@ spec:
       enableServiceLinks: false
       nodeSelector:
         hardware: rpi5
+        node-role.kubernetes.io/worker: "true"
       affinity:
         nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: node-role.kubernetes.io/control-plane
+                    operator: DoesNotExist
+                  - key: node-role.kubernetes.io/master
+                    operator: DoesNotExist
           preferredDuringSchedulingIgnoredDuringExecution:
             - weight: 50
               preference: