diff --git a/charts/codefresh/.ci/values/defaults.yaml b/charts/codefresh/.ci/values/defaults.yaml
index 2f80ae4cd..431dcfe8f 100644
--- a/charts/codefresh/.ci/values/defaults.yaml
+++ b/charts/codefresh/.ci/values/defaults.yaml
@@ -100,3 +100,13 @@ hooks:
   mongodb:
     nodeSelector:
       kubernetes.io/arch: amd64
+  rabbitmq:
+    nodeSelector:
+      kubernetes.io/arch: amd64
+  consul:
+    nodeSelector:
+      kubernetes.io/arch: amd64
+
+seed:
+  nodeSelector:
+    kubernetes.io/arch: amd64
diff --git a/charts/codefresh/Chart.yaml b/charts/codefresh/Chart.yaml
index 0b640d5d9..0a82bf5c3 100644
--- a/charts/codefresh/Chart.yaml
+++ b/charts/codefresh/Chart.yaml
@@ -111,92 +111,92 @@ dependencies:
     condition: gitops-dashboard-manager.enabled
   - name: cfapi
     alias: cfapi
-    version: 21.279.8
+    version: 21.279.9-onprem-71444dd
     repository: oci://quay.io/codefresh/charts
     condition: cfapi.enabled
   - name: cfapi
     alias: cfapi-auth
-    version: 21.279.8
+    version: 21.279.9-onprem-71444dd
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-auth.enabled
   - name: cfapi
     alias: cfapi-internal
-    version: 21.279.8
+    version: 21.279.9-onprem-71444dd
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-internal.enabled
   - name: cfapi
     alias: cfapi-ws
-    version: 21.279.8
+    version: 21.279.9-onprem-71444dd
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-ws.enabled
   - name: cfapi
     alias: cfapi-admin
-    version: 21.279.8
+    version: 21.279.9-onprem-71444dd
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-admin.enabled
   - name: cfapi
     alias: cfapi-endpoints
-    version: 21.279.8
+    version: 21.279.9-onprem-71444dd
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-endpoints.enabled
   - name: cfapi
     alias: cfapi-terminators
-    version: 21.279.8
+    version: 21.279.9-onprem-71444dd
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-terminators.enabled
   - name: cfapi
     alias: cfapi-sso-group-synchronizer
-    version: 21.279.8
+    version: 21.279.9-onprem-71444dd
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-sso-group-synchronizer.enabled
   - name: cfapi
     alias: cfapi-buildmanager
-    version: 21.279.8
+    version: 21.279.9-onprem-71444dd
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-buildmanager.enabled
   - name: cfapi
     alias: cfapi-cacheevictmanager
-    version: 21.279.8
+    version: 21.279.9-onprem-71444dd
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-cacheevictmanager.enabled
   - name: cfapi
     alias: cfapi-eventsmanagersubscriptions
-    version: 21.279.8
+    version: 21.279.9-onprem-71444dd
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-eventsmanagersubscriptions.enabled
   - name: cfapi
     alias: cfapi-kubernetesresourcemonitor
-    version: 21.279.8
+    version: 21.279.9-onprem-71444dd
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-kubernetesresourcemonitor.enabled
   - name: cfapi
     alias: cfapi-environments
-    version: 21.279.8
+    version: 21.279.9-onprem-71444dd
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-environments.enabled
   - name: cfapi
     alias: cfapi-gitops-resource-receiver
-    version: 21.279.8
+    version: 21.279.9-onprem-71444dd
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-gitops-resource-receiver.enabled
   - name: cfapi
     alias: cfapi-downloadlogmanager
-    version: 21.279.8
+    version: 21.279.9-onprem-71444dd
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-downloadlogmanager.enabled
   - name: cfapi
     alias: cfapi-teams
-    version: 21.279.8
+    version: 21.279.9-onprem-71444dd
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-teams.enabled
   - name: cfapi
     alias: cfapi-kubernetes-endpoints
-    version: 21.279.8
+    version: 21.279.9-onprem-71444dd
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-kubernetes-endpoints.enabled
   - name: cfapi
     alias: cfapi-test-reporting
-    version: 21.279.8
+    version: 21.279.9-onprem-71444dd
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-test-reporting.enabled
   - name: cfui