diff --git a/charts/codefresh/.ci/values/defaults.yaml b/charts/codefresh/.ci/values/defaults.yaml
index 0bae9c1e0..4f7c5cc5f 100644
--- a/charts/codefresh/.ci/values/defaults.yaml
+++ b/charts/codefresh/.ci/values/defaults.yaml
@@ -100,3 +100,6 @@ hooks:
   mongodb:
     nodeSelector:
       kubernetes.io/arch: amd64
+  rabbitmq:
+    nodeSelector:
+      kubernetes.io/arch: amd64
diff --git a/charts/codefresh/Chart.yaml b/charts/codefresh/Chart.yaml
index 62792d2e6..e428e3e1f 100644
--- a/charts/codefresh/Chart.yaml
+++ b/charts/codefresh/Chart.yaml
@@ -98,96 +98,96 @@ dependencies:
     condition: gitops-dashboard-manager.enabled
   - name: cfapi
     alias: cfapi
-    version: 21.291.11
+    version: 21.291.17
     repository: oci://quay.io/codefresh/charts
     condition: cfapi.enabled
   - name: cfapi
     alias: cfapi-auth
-    version: 21.291.11
+    version: 21.291.17
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-auth.enabled
   - name: cfapi
     alias: cfapi-internal
-    version: 21.291.11
+    version: 21.291.17
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-internal.enabled
   - name: cfapi
     alias: cfapi-ws
-    version: 21.291.11
+    version: 21.291.17
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-ws.enabled
   - name: cfapi
     alias: cfapi-admin
-    version: 21.291.11
+    version: 21.291.17
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-admin.enabled
   - name: cfapi
     alias: cfapi-endpoints
-    version: 21.291.11
+    version: 21.291.17
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-endpoints.enabled
   - name: cfapi
     alias: cfapi-terminators
-    version: 21.291.11
+    version: 21.291.17
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-terminators.enabled
   - name: cfapi
     alias: cfapi-sso-group-synchronizer
-    version: 21.291.11
+    version: 21.291.17
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-sso-group-synchronizer.enabled
   - name: cfapi
     alias: cfapi-buildmanager
-    version: 21.291.11
+    version: 21.291.17
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-buildmanager.enabled
   - name: cfapi
     alias: cfapi-cacheevictmanager
-    version: 21.291.11
+    version: 21.291.17
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-cacheevictmanager.enabled
   - name: cfapi
     alias: cfapi-eventsmanagersubscriptions
-    version: 21.291.11
+    version: 21.291.17
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-eventsmanagersubscriptions.enabled
   - name: cfapi
     alias: cfapi-kubernetesresourcemonitor
-    version: 21.291.11
+    version: 21.291.17
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-kubernetesresourcemonitor.enabled
   - name: cfapi
     alias: cfapi-environments
-    version: 21.291.11
+    version: 21.291.17
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-environments.enabled
   - name: cfapi
     alias: cfapi-gitops-resource-receiver
-    version: 21.291.11
+    version: 21.291.17
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-gitops-resource-receiver.enabled
   - name: cfapi
     alias: cfapi-downloadlogmanager
-    version: 21.291.11
+    version: 21.291.17
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-downloadlogmanager.enabled
   - name: cfapi
     alias: cfapi-teams
-    version: 21.291.11
+    version: 21.291.17
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-teams.enabled
   - name: cfapi
     alias: cfapi-kubernetes-endpoints
-    version: 21.291.11
+    version: 21.291.17
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-kubernetes-endpoints.enabled
   - name: cfapi
     alias: cfapi-test-reporting
-    version: 21.291.11
+    version: 21.291.17
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-test-reporting.enabled
   - name: cfui
-    version: 14.99.34
+    version: 14.99.39
     repository: oci://quay.io/codefresh/charts
     condition: cfui.enabled
   - name: k8s-monitor
@@ -195,7 +195,7 @@ dependencies:
     repository: oci://quay.io/codefresh/charts
     condition: k8s-monitor.enabled
   - name: runtime-environment-manager
-    version: 3.43.0
+    version: 3.43.4
     repository: oci://quay.io/codefresh/charts
     condition: runtime-environment-manager.enabled
   - name: cf-broadcaster
@@ -229,7 +229,7 @@ dependencies:
     repository: oci://quay.io/codefresh/charts
     condition: argo-platform.enabled
   - name: argo-platform
-    version: 1.3740.0
+    version: 1.3750.0
     repository: oci://quay.io/codefresh/charts
     condition: argo-platform.enabled
   - name: argo-hub-platform
diff --git a/charts/codefresh/tests/misc/global_constrains_test.yaml b/charts/codefresh/tests/misc/global_constrains_test.yaml
index d96b85006..b67f599df 100644
--- a/charts/codefresh/tests/misc/global_constrains_test.yaml
+++ b/charts/codefresh/tests/misc/global_constrains_test.yaml
@@ -1156,6 +1156,7 @@ tests:
           path: spec.template.spec.nodeSelector
           value:
             key: "value"
+            kubernetes.io/arch: amd64
       - equal:
           path: spec.template.spec.affinity
           value:
diff --git a/charts/codefresh/values.yaml b/charts/codefresh/values.yaml
index cd3300a6a..367dd7e9b 100644
--- a/charts/codefresh/values.yaml
+++ b/charts/codefresh/values.yaml
@@ -444,7 +444,8 @@ hooks:
       repository: codefresh/mongosh
       tag: 2.5.0
     affinity: {}
-    nodeSelector: {}
+    nodeSelector:
+      kubernetes.io/arch: amd64
     podSecurityContext: {}
     resources: {}
     tolerations: []
@@ -468,7 +469,8 @@ hooks:
       repository: codefresh/rabbitmqadmin
       tag: 2.8.0
     affinity: {}
-    nodeSelector: {}
+    nodeSelector:
+      kubernetes.io/arch: amd64
     podSecurityContext: {}
     resources: {}
     tolerations: []