diff --git a/home-assistant/zigbee2mqtt.yaml b/home-assistant/zigbee2mqtt.yaml
index a09dfb1..2e2b7d5 100644
--- a/home-assistant/zigbee2mqtt.yaml
+++ b/home-assistant/zigbee2mqtt.yaml
@@ -55,9 +55,10 @@ spec:
       nodeSelector:
         node-role.kubernetes.io/zigbee-ctrl: ''
       tolerations:
-      - key: du5t1n.me/machine
-        value: raspberrypi
-        effect: NoExecute
+      - key: node-role.kubernetes.io/zigbee-ctrl
+        effect: NoSchedule
+      - key: node-role.kubernetes.io/zwave-ctrl
+        effect: NoSchedule
       containers:
       - name: zigbee2mqtt
         image: ghcr.io/koenkk/zigbee2mqtt:1.33.1
diff --git a/home-assistant/zwavejs2mqtt.yaml b/home-assistant/zwavejs2mqtt.yaml
index cbf2b94..d3c7144 100644
--- a/home-assistant/zwavejs2mqtt.yaml
+++ b/home-assistant/zwavejs2mqtt.yaml
@@ -57,9 +57,10 @@ spec:
       nodeSelector:
         node-role.kubernetes.io/zwave-ctrl: ''
       tolerations:
-      - key: du5t1n.me/machine
-        value: raspberrypi
-        effect: NoExecute
+      - key: node-role.kubernetes.io/zigbee-ctrl
+        effect: NoSchedule
+      - key: node-role.kubernetes.io/zwave-ctrl
+        effect: NoSchedule
       containers:
       - name: zwavejs2mqtt
         image: ghcr.io/zwave-js/zwave-js-ui:9.1.2
diff --git a/xactmon/xactmon.yaml b/xactmon/xactmon.yaml
index 5254f87..36ff460 100644
--- a/xactmon/xactmon.yaml
+++ b/xactmon/xactmon.yaml
@@ -51,6 +51,8 @@ spec:
           subPath: tmp
       imagePullSecrets:
       - name: imagepull-gitea
+      nodeSelector:
+        kubernetes.io/arch: amd64
       securityContext:
         runAsUser: 251
         runAsGroup: 251
@@ -132,6 +134,8 @@ spec:
           subPath: tmp
       imagePullSecrets:
       - name: imagepull-gitea
+      nodeSelector:
+        kubernetes.io/arch: amd64
       securityContext:
         runAsUser: 251
         runAsGroup: 251
@@ -214,6 +218,8 @@ spec:
           subPath: tmp
       imagePullSecrets:
       - name: imagepull-gitea
+      nodeSelector:
+        kubernetes.io/arch: amd64
       securityContext:
         runAsUser: 251
         runAsGroup: 251
@@ -296,6 +302,8 @@ spec:
           subPath: tmp
       imagePullSecrets:
       - name: imagepull-gitea
+      nodeSelector:
+        kubernetes.io/arch: amd64
       securityContext:
         runAsUser: 251
         runAsGroup: 251