diff --git a/services/harbor/helmrelease.yaml b/services/harbor/helmrelease.yaml
index 0e84fa5a..a5552c5d 100644
--- a/services/harbor/helmrelease.yaml
+++ b/services/harbor/helmrelease.yaml
@@ -65,22 +65,22 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
               - matchExpressions:
-                  - key: hardware
+                  - key: kubernetes.io/arch
                     operator: In
-                    values: [ "rpi4", "rpi5" ]
+                    values: [ "amd64" ]
           preferredDuringSchedulingIgnoredDuringExecution:
             - weight: 90
               preference:
                 matchExpressions:
-                  - key: hardware
+                  - key: kubernetes.io/hostname
                     operator: In
-                    values: [ "rpi4" ]
+                    values: [ "titan-22" ]
             - weight: 10
               preference:
                 matchExpressions:
-                  - key: hardware
+                  - key: kubernetes.io/hostname
                     operator: In
-                    values: [ "rpi5" ]
+                    values: [ "titan-24" ]
     trivy:
       enabled: false
     metrics:
@@ -99,87 +99,87 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
               - matchExpressions:
-                  - key: hardware
+                  - key: kubernetes.io/arch
                     operator: In
-                    values: [ "rpi4", "rpi5" ]
+                    values: [ "amd64" ]
           preferredDuringSchedulingIgnoredDuringExecution:
             - weight: 90
               preference:
                 matchExpressions:
-                  - key: hardware
+                  - key: kubernetes.io/hostname
                     operator: In
-                    values: [ "rpi4" ]
+                    values: [ "titan-22" ]
             - weight: 10
               preference:
                 matchExpressions:
-                  - key: hardware
+                  - key: kubernetes.io/hostname
                     operator: In
-                    values: [ "rpi5" ]
+                    values: [ "titan-24" ]
     jobservice:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
               - matchExpressions:
-                  - key: hardware
+                  - key: kubernetes.io/arch
                     operator: In
-                    values: [ "rpi4", "rpi5" ]
+                    values: [ "amd64" ]
           preferredDuringSchedulingIgnoredDuringExecution:
             - weight: 90
               preference:
                 matchExpressions:
-                  - key: hardware
+                  - key: kubernetes.io/hostname
                     operator: In
-                    values: [ "rpi4" ]
+                    values: [ "titan-22" ]
             - weight: 10
               preference:
                 matchExpressions:
-                  - key: hardware
+                  - key: kubernetes.io/hostname
                     operator: In
-                    values: [ "rpi5" ]
+                    values: [ "titan-24" ]
     portal:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
               - matchExpressions:
-                  - key: hardware
+                  - key: kubernetes.io/arch
                     operator: In
-                    values: [ "rpi4", "rpi5" ]
+                    values: [ "amd64" ]
           preferredDuringSchedulingIgnoredDuringExecution:
             - weight: 90
               preference:
                 matchExpressions:
-                  - key: hardware
+                  - key: kubernetes.io/hostname
                     operator: In
-                    values: [ "rpi4" ]
+                    values: [ "titan-22" ]
             - weight: 10
               preference:
                 matchExpressions:
-                  - key: hardware
+                  - key: kubernetes.io/hostname
                     operator: In
-                    values: [ "rpi5" ]
+                    values: [ "titan-24" ]
     registry:
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
               - matchExpressions:
-                  - key: hardware
+                  - key: kubernetes.io/arch
                     operator: In
-                    values: [ "rpi4", "rpi5" ]
+                    values: [ "amd64" ]
           preferredDuringSchedulingIgnoredDuringExecution:
             - weight: 90
               preference:
                 matchExpressions:
-                  - key: hardware
+                  - key: kubernetes.io/hostname
                     operator: In
-                    values: [ "rpi4" ]
+                    values: [ "titan-22" ]
             - weight: 10
               preference:
                 matchExpressions:
-                  - key: hardware
+                  - key: kubernetes.io/hostname
                     operator: In
-                    values: [ "rpi5" ]
+                    values: [ "titan-24" ]
     updateStrategy:
       type: Recreate