diff --git a/codefresh/Chart.lock b/codefresh/Chart.lock
index d85dd96b9..b1d6c0e26 100644
--- a/codefresh/Chart.lock
+++ b/codefresh/Chart.lock
@@ -7,7 +7,7 @@ dependencies:
   version: 0.9.0
 - name: consul
   repository: https://charts.bitnami.com/bitnami
-  version: 11.3.13
+  version: 11.3.16
 - name: mongodb
   repository: https://charts.bitnami.com/bitnami
   version: 14.4.1
@@ -19,16 +19,16 @@ dependencies:
   version: 12.0.4
 - name: redis
   repository: https://charts.bitnami.com/bitnami
-  version: 20.0.3
+  version: 20.1.7
 - name: redis-ha
   repository: https://dandydeveloper.github.io/charts
   version: 4.26.1
 - name: rabbitmq
   repository: https://charts.bitnami.com/bitnami
-  version: 14.6.9
+  version: 15.0.1
 - name: nats
   repository: https://charts.bitnami.com/bitnami
-  version: 8.3.2
+  version: 8.4.4
 - name: builder
   repository: oci://quay.io/codefresh/charts
   version: 1.3.0
@@ -37,7 +37,7 @@ dependencies:
   version: 1.3.0
 - name: ingress-nginx
   repository: https://kubernetes.github.io/ingress-nginx
-  version: 4.10.0
+  version: 4.11.2
 - name: cluster-providers
   repository: oci://quay.io/codefresh/charts
   version: 1.17.8
@@ -46,7 +46,7 @@ dependencies:
   version: 1.31.9
 - name: charts-manager
   repository: oci://quay.io/codefresh/charts
-  version: 1.18.1
+  version: 1.18.2
 - name: cfsign
   repository: oci://quay.io/codefresh/charts
   version: 1.8.4
@@ -55,73 +55,73 @@ dependencies:
   version: 1.26.10
 - name: context-manager
   repository: oci://quay.io/codefresh/charts
-  version: 2.30.1
+  version: 2.30.2
 - name: pipeline-manager
   repository: oci://quay.io/codefresh/charts
-  version: 3.135.7
+  version: 3.135.8
 - name: gitops-dashboard-manager
   repository: oci://quay.io/codefresh/charts
   version: 1.14.15
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.38
+  version: 21.260.39
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.38
+  version: 21.260.39
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.38
+  version: 21.260.39
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.38
+  version: 21.260.39
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.38
+  version: 21.260.39
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.38
+  version: 21.260.39
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.38
+  version: 21.260.39
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.38
+  version: 21.260.39
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.38
+  version: 21.260.39
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.38
+  version: 21.260.39
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.38
+  version: 21.260.39
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.38
+  version: 21.260.39
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.38
+  version: 21.260.39
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.38
+  version: 21.260.39
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.38
+  version: 21.260.39
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.38
+  version: 21.260.39
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.38
+  version: 21.260.39
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.38
+  version: 21.260.39
 - name: cfui
   repository: oci://quay.io/codefresh/charts
-  version: 14.95.76
+  version: 14.95.77
 - name: k8s-monitor
   repository: oci://quay.io/codefresh/charts
-  version: 4.11.7
+  version: 4.11.8
 - name: runtime-environment-manager
   repository: oci://quay.io/codefresh/charts
   version: 3.36.3
@@ -142,18 +142,18 @@ dependencies:
   version: 0.8.7
 - name: cf-platform-analytics
   repository: oci://quay.io/codefresh/charts
-  version: 0.49.62
+  version: 0.49.63
 - name: cf-platform-analytics
   repository: oci://quay.io/codefresh/charts
-  version: 0.49.62
+  version: 0.49.63
 - name: argo-platform
   repository: oci://quay.io/codefresh/charts
-  version: 1.3035.0
+  version: 1.3036.0-onprem-10b556f
 - name: argo-hub-platform
   repository: oci://quay.io/codefresh/charts
-  version: 0.1.15
+  version: 0.1.16
 - name: cf-oidc-provider
   repository: oci://quay.io/codefresh/charts
   version: 0.0.15
-digest: sha256:7ee9e7903f3afb3f0c8dbcda015126c2b581e01789a565b594b183a0d25e3130
-generated: "2024-09-27T11:02:13.169075439+03:00"
+digest: sha256:51979bbbb995332f38f4dee77b8d32e07241dba5a016d62e5b9c870a32633742
+generated: "2024-10-03T18:08:21.167159596+03:00"
diff --git a/codefresh/Chart.yaml b/codefresh/Chart.yaml
index 1f1326109..a5070fc57 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.5.1
+version: 2.5.2
 keywords:
   - codefresh
 home: https://codefresh.io/
@@ -19,17 +19,7 @@ annotations:
   # supported kinds are added, changed, deprecated, removed, fixed and security.
   artifacthub.io/changes: |
     - kind: security
-      description: "Misc security fixes"
-    - kind: fixed
-      description: "(cfapi) Fix gerrit webhooks"
-      links:
-        - name: JIRA Issue
-          url: https://codefresh-io.atlassian.net/browse/CR-25268
-    - kind: changed
-      description: "(cfui) Remove the topbar component"
-      links:
-        - name: JIRA Issue
-          url: https://codefresh-io.atlassian.net/browse/CR-25035
+      description: "Miscellaneous security updates"
 dependencies:
   - name: cf-common
     repository: oci://quay.io/codefresh/charts
@@ -39,7 +29,7 @@ dependencies:
     version: 0.9.0
     condition: internal-gateway.enabled
   - name: consul
-    version: 11.3.13
+    version: 11.3.16
     repository: https://charts.bitnami.com/bitnami
     condition: consul.enabled
   - name: mongodb
@@ -55,7 +45,7 @@ dependencies:
     repository: oci://registry-1.docker.io/bitnamicharts
     condition: postgresql-ha.enabled
   - name: redis
-    version: 20.0.3
+    version: 20.1.7
     repository: https://charts.bitnami.com/bitnami
     condition: redis.enabled
   - name: redis-ha
@@ -63,11 +53,11 @@ dependencies:
     version: 4.26.1
     condition: redis-ha.enabled
   - name: rabbitmq
-    version: 14.6.9
+    version: 15.0.1
     repository: https://charts.bitnami.com/bitnami
     condition: rabbitmq.enabled
   - name: nats
-    version: 8.3.2
+    version: 8.4.4
     repository: https://charts.bitnami.com/bitnami
     condition: nats.enabled
   - name: builder
@@ -79,7 +69,7 @@ dependencies:
     condition: runner.enabled
     version: 1.3.0
   - name: ingress-nginx
-    version: 4.10.0
+    version: 4.11.2
     repository: https://kubernetes.github.io/ingress-nginx
     condition: ingress-nginx.enabled
   - name: cluster-providers
@@ -247,7 +237,7 @@ dependencies:
     repository: oci://quay.io/codefresh/charts
     condition: argo-platform.enabled
   - name: argo-platform
-    version: "~1.3035.0"
+    version: "1.3036.0-onprem-10b556f"
     repository: oci://quay.io/codefresh/charts
     condition: argo-platform.enabled
   - name: argo-hub-platform
diff --git a/codefresh/README.md b/codefresh/README.md
index 94ce56113..8747d9d88 100644
--- a/codefresh/README.md
+++ b/codefresh/README.md
@@ -1,6 +1,6 @@
 ## Codefresh On-Premises
 
-![Version: 2.5.1](https://img.shields.io/badge/Version-2.5.1-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
+![Version: 2.5.2](https://img.shields.io/badge/Version-2.5.2-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
 
 Helm chart for deploying [Codefresh On-Premises](https://codefresh.io/docs/docs/getting-started/intro-to-codefresh/) to Kubernetes.
 
@@ -2019,7 +2019,7 @@ kubectl -n $NAMESPACE delete secret codefresh-certs-server
 | argo-platform.runtime-monitor | object | See below | runtime-monitor Don't enable! Not used in onprem! |
 | argo-platform.ui | object | See below | ui |
 | argo-platform.useExternalSecret | bool | `false` | Use regular k8s secret object. Keep `false`! |
-| builder | object | `{"affinity":{},"container":{"image":{"registry":"docker.io","repository":"library/docker","tag":"27.0-dind"}},"enabled":true,"initContainers":{"register":{"image":{"registry":"quay.io","repository":"codefresh/curl","tag":"8.4.0"}}},"nodeSelector":{},"podSecurityContext":{},"resources":{},"tolerations":[]}` | builder |
+| builder | object | `{"affinity":{},"container":{"image":{"registry":"docker.io","repository":"library/docker","tag":"27.3-dind"}},"enabled":true,"initContainers":{"register":{"image":{"registry":"quay.io","repository":"codefresh/curl","tag":"8.10.1"}}},"nodeSelector":{},"podSecurityContext":{},"resources":{},"tolerations":[]}` | builder |
 | cf-broadcaster | object | See below | broadcaster |
 | cf-oidc-provider | object | See below | cf-oidc-provider |
 | cf-platform-analytics-etlstarter | object | See below | etl-starter |
diff --git a/codefresh/values.yaml b/codefresh/values.yaml
index bb5402c70..e5b90c4f7 100644
--- a/codefresh/values.yaml
+++ b/codefresh/values.yaml
@@ -14,7 +14,7 @@ gencerts:
   image:
     registry: quay.io
     repository: codefresh/kubectl
-    tag: 1.29.2
+    tag: 1.31.1
   rbac:
     enabled: true
   ttlSecondsAfterFinished: 300
@@ -36,7 +36,7 @@ seed:
     image:
       registry: quay.io
       repository: codefresh/mongosh
-      tag: 2.1.1
+      tag: 2.3.1
     # -- Root user in plain text (required ONLY for seed job!).
     mongodbRootUser: "root"
     # -- Root user from existing secret
@@ -425,7 +425,7 @@ hooks:
   image:
     registry: quay.io
     repository: codefresh/mongosh
-    tag: 2.1.1
+    tag: 2.3.1
   affinity: {}
   nodeSelector: {}
   podSecurityContext: {}
@@ -465,10 +465,10 @@ runtimeImages:
   FS_OPS_IMAGE: quay.io/codefresh/fs-ops:1.2.7
   GIT_CLONE_IMAGE: quay.io/codefresh/cf-git-cloner:10.1.28
   KUBE_DEPLOY: quay.io/codefresh/cf-deploy-kubernetes:16.2.6
-  PIPELINE_DEBUGGER_IMAGE: quay.io/codefresh/cf-debugger:1.3.5
+  PIPELINE_DEBUGGER_IMAGE: quay.io/codefresh/cf-debugger:1.3.6
   TEMPLATE_ENGINE: quay.io/codefresh/pikolo:0.14.1
-  CR_6177_FIXER: docker.io/library/alpine:edge
-  GC_BUILDER_IMAGE: docker.io/library/alpine:edge
+  CR_6177_FIXER: docker.io/library/alpine:3.20
+  GC_BUILDER_IMAGE: docker.io/library/alpine:3.20
 
 #--------------------
 # Codefresh subcharts
@@ -766,7 +766,7 @@ cfsign:
       image:
         registry: quay.io
         repository: codefresh/curl
-        tag: 8.5.0
+        tag: 8.10.1
   affinity: {}
   nodeSelector: {}
   podSecurityContext: {}
@@ -1187,12 +1187,12 @@ builder:
       image:
         registry: quay.io
         repository: codefresh/curl
-        tag: 8.4.0
+        tag: 8.10.1
   container:
     image:
       registry: docker.io
       repository: library/docker
-      tag: 27.0-dind
+      tag: 27.3-dind
   affinity: {}
   nodeSelector: {}
   podSecurityContext: {}
@@ -1208,12 +1208,12 @@ runner:
       image:
         registry: quay.io
         repository: codefresh/curl
-        tag: 8.4.0
+        tag: 8.10.1
   container:
     image:
       registry: docker.io
       repository: library/docker
-      tag: 27.0-dind
+      tag: 27.3-dind
   affinity: {}
   nodeSelector: {}
   podSecurityContext: {}