diff --git a/services/monitoring/helmrelease.yaml b/services/monitoring/helmrelease.yaml
index a50b2cc8..c45d513a 100644
--- a/services/monitoring/helmrelease.yaml
+++ b/services/monitoring/helmrelease.yaml
@@ -722,8 +722,6 @@ spec:
         name: prometheus
         namespace: flux-system
   values:
-    nodeSelector:
-      hardware: rpi5
     affinity:
       nodeAffinity:
         requiredDuringSchedulingIgnoredDuringExecution:
@@ -733,6 +731,23 @@ spec:
                   operator: NotIn
                   values:
                     - titan-22
+                - key: node-role.kubernetes.io/control-plane
+                  operator: DoesNotExist
+        preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            preference:
+              matchExpressions:
+                - key: hardware
+                  operator: In
+                  values:
+                    - rpi5
+          - weight: 50
+            preference:
+              matchExpressions:
+                - key: hardware
+                  operator: In
+                  values:
+                    - rpi4
     ingress:
       enabled: true
       ingressClassName: traefik