diff --git a/codefresh/.ci/values/defaults.yaml b/codefresh/.ci/values/defaults.yaml
index b80ffbbe4..2f80ae4cd 100644
--- a/codefresh/.ci/values/defaults.yaml
+++ b/codefresh/.ci/values/defaults.yaml
@@ -79,3 +79,24 @@ argo-platform:
 mongodb:
   migration:
     enabled: true
+  image:
+    repository: bitnamilegacy/mongodb
+  nodeSelector:
+    kubernetes.io/arch: amd64
+
+consul:
+  image:
+    repository: bitnamilegacy/consul
+
+nats:
+  image:
+    repository: bitnamilegacy/nats
+
+rabbitmq:
+  image:
+    repository: bitnamilegacy/rabbitmq
+
+hooks:
+  mongodb:
+    nodeSelector:
+      kubernetes.io/arch: amd64
diff --git a/codefresh/Chart.lock b/codefresh/Chart.lock
index 21a9529b2..7c8f22d3a 100644
--- a/codefresh/Chart.lock
+++ b/codefresh/Chart.lock
@@ -4,7 +4,7 @@ dependencies:
   version: 0.18.1
 - name: internal-gateway
   repository: oci://quay.io/codefresh/charts
-  version: 0.10.6
+  version: 0.11.0
 - name: consul
   repository: https://charts.bitnami.com/bitnami
   version: 11.4.32
@@ -160,12 +160,12 @@ dependencies:
   version: 1.21.0
 - name: payments
   repository: oci://quay.io/codefresh/charts
-  version: 2.24.0
+  version: 2.24.1
 - name: segment-reporter
   repository: oci://quay.io/codefresh/charts
   version: 1.18.0
 - name: salesforce-reporter
   repository: oci://quay.io/codefresh/charts
   version: 1.30.11
-digest: sha256:6a1af6f7dc7b6b6ea843b922929016b581a031a63838eaf107a687cc78d89b71
-generated: "2025-08-22T10:31:59.553695+03:00"
+digest: sha256:4e7b52e0ee6d81e910d3e7352b14cb5a7d01c51a7bcd7a8e455c53cc2564d982
+generated: "2025-08-29T15:06:33.935106+03:00"
diff --git a/codefresh/Chart.yaml b/codefresh/Chart.yaml
index 7c27ab931..622c9b297 100644
--- a/codefresh/Chart.yaml
+++ b/codefresh/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Helm Chart for Codefresh On-Prem
 name: codefresh
-version: 2.8.12
+version: 2.8.13
 keywords:
   - codefresh
 home: https://codefresh.io/
@@ -18,17 +18,20 @@ annotations:
   artifacthub.io/containsSecurityUpdates: "true"
   # supported kinds are added, changed, deprecated, removed, fixed and security.
   artifacthub.io/changes: |
-    - kind: fixed
-      description: "Fix RabbitMQ version requirements."
-    - kind: security
-      description: "Contains security fixes"
+    - kind: changed
+      description: "Update internal-gateway"
+    - kind: changed
+      description: "Change bitnami subcharts to use bitnamilegacy repository"
+      links:
+        - name: GitHub Issue
+          url: https://github.com/bitnami/charts/issues/35164
 dependencies:
   - name: cf-common
     repository: oci://quay.io/codefresh/charts
     version: 0.18.1
   - name: internal-gateway
     repository: oci://quay.io/codefresh/charts
-    version: 0.10.6
+    version: 0.11.0
     condition: internal-gateway.enabled
   - name: consul
     version: 11.4.32
diff --git a/codefresh/README.md b/codefresh/README.md
index 9e6e0ba5e..e0b141dc2 100644
--- a/codefresh/README.md
+++ b/codefresh/README.md
@@ -1,6 +1,6 @@
 ## Codefresh On-Premises
 
-![Version: 2.8.12](https://img.shields.io/badge/Version-2.8.12-informational?style=flat-square) ![AppVersion: 2.8.0](https://img.shields.io/badge/AppVersion-2.8.0-informational?style=flat-square)
+![Version: 2.8.13](https://img.shields.io/badge/Version-2.8.13-informational?style=flat-square) ![AppVersion: 2.8.0](https://img.shields.io/badge/AppVersion-2.8.0-informational?style=flat-square)
 
 Helm chart for deploying [Codefresh On-Premises](https://codefresh.io/docs/docs/getting-started/intro-to-codefresh/) to Kubernetes.
 
diff --git a/codefresh/values.yaml b/codefresh/values.yaml
index b129b8b41..3b5d09448 100644
--- a/codefresh/values.yaml
+++ b/codefresh/values.yaml
@@ -913,6 +913,8 @@ cluster-providers:
 # Ref: https://github.com/bitnami/charts/blob/main/bitnami/consul/values.yaml
 consul:
   enabled: true
+  image:
+    repository: bitnamilegacy/consul
   datacenterName: codefresh-onprem
   replicaCount: 1
   extraEnvVars:
@@ -1113,6 +1115,8 @@ kube-integration:
 mongodb:
   enabled: true
   architecture: standalone
+  image:
+    repository: bitnamilegacy/mongodb
   useStatefulSet: true
   auth:
     enabled: true
@@ -1131,6 +1135,8 @@ mongodb:
 # Ref: https://github.com/bitnami/charts/blob/main/bitnami/nats/values.yaml
 nats:
   enabled: true
+  image:
+    repository: bitnamilegacy/nats
   replicaCount: 1
   auth:
     enabled: false
@@ -1251,6 +1257,7 @@ redis-ha:
 rabbitmq:
   enabled: true
   image:
+    repository: bitnamilegacy/rabbitmq
     tag: "4.1.3"
   replicaCount: 1
   auth: