diff --git a/codefresh/Chart.lock b/codefresh/Chart.lock
index b735f5533..d85dd96b9 100644
--- a/codefresh/Chart.lock
+++ b/codefresh/Chart.lock
@@ -40,19 +40,19 @@ dependencies:
   version: 4.10.0
 - name: cluster-providers
   repository: oci://quay.io/codefresh/charts
-  version: 1.17.7
+  version: 1.17.8
 - name: kube-integration
   repository: oci://quay.io/codefresh/charts
-  version: 1.31.8
+  version: 1.31.9
 - name: charts-manager
   repository: oci://quay.io/codefresh/charts
   version: 1.18.1
 - name: cfsign
   repository: oci://quay.io/codefresh/charts
-  version: 1.8.2
+  version: 1.8.4
 - name: tasker-kubernetes
   repository: oci://quay.io/codefresh/charts
-  version: 1.26.9
+  version: 1.26.10
 - name: context-manager
   repository: oci://quay.io/codefresh/charts
   version: 2.30.1
@@ -61,64 +61,64 @@ dependencies:
   version: 3.135.7
 - name: gitops-dashboard-manager
   repository: oci://quay.io/codefresh/charts
-  version: 1.14.14
+  version: 1.14.15
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.37
+  version: 21.260.38
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.37
+  version: 21.260.38
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.37
+  version: 21.260.38
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.37
+  version: 21.260.38
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.37
+  version: 21.260.38
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.37
+  version: 21.260.38
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.37
+  version: 21.260.38
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.37
+  version: 21.260.38
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.37
+  version: 21.260.38
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.37
+  version: 21.260.38
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.37
+  version: 21.260.38
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.37
+  version: 21.260.38
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.37
+  version: 21.260.38
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.37
+  version: 21.260.38
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.37
+  version: 21.260.38
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.37
+  version: 21.260.38
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.37
+  version: 21.260.38
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.260.37
+  version: 21.260.38
 - name: cfui
   repository: oci://quay.io/codefresh/charts
-  version: 14.95.75
+  version: 14.95.76
 - name: k8s-monitor
   repository: oci://quay.io/codefresh/charts
   version: 4.11.7
@@ -127,33 +127,33 @@ dependencies:
   version: 3.36.3
 - name: cf-broadcaster
   repository: oci://quay.io/codefresh/charts
-  version: 1.12.14
+  version: 1.12.16
 - name: helm-repo-manager
   repository: oci://quay.io/codefresh/charts
   version: 0.16.1
 - name: hermes
   repository: oci://quay.io/codefresh/charts
-  version: 0.21.9
+  version: 0.21.10
 - name: nomios
   repository: oci://quay.io/codefresh/charts
-  version: 0.11.6
+  version: 0.11.7
 - name: cronus
   repository: oci://quay.io/codefresh/charts
-  version: 0.8.6
+  version: 0.8.7
 - name: cf-platform-analytics
   repository: oci://quay.io/codefresh/charts
-  version: 0.49.59
+  version: 0.49.62
 - name: cf-platform-analytics
   repository: oci://quay.io/codefresh/charts
-  version: 0.49.59
+  version: 0.49.62
 - name: argo-platform
   repository: oci://quay.io/codefresh/charts
   version: 1.3035.0
 - name: argo-hub-platform
   repository: oci://quay.io/codefresh/charts
-  version: 0.1.14
+  version: 0.1.15
 - name: cf-oidc-provider
   repository: oci://quay.io/codefresh/charts
   version: 0.0.15
-digest: sha256:2a17a7e71f24546411100242dc899cdf51477191fc6040ab9aff37ce32801337
-generated: "2024-09-08T13:36:22.908665155+03:00"
+digest: sha256:7ee9e7903f3afb3f0c8dbcda015126c2b581e01789a565b594b183a0d25e3130
+generated: "2024-09-27T11:02:13.169075439+03:00"
diff --git a/codefresh/Chart.yaml b/codefresh/Chart.yaml
index 8048f0636..1f1326109 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.0
+version: 2.5.1
 keywords:
   - codefresh
 home: https://codefresh.io/
@@ -18,10 +18,18 @@ annotations:
   # artifacthub.io/containsSecurityUpdates: "true"
   # supported kinds are added, changed, deprecated, removed, fixed and security.
   artifacthub.io/changes: |
+    - kind: security
+      description: "Misc security fixes"
     - kind: fixed
-      description: "Fix E2E tests"
+      description: "(cfapi) Fix gerrit webhooks"
+      links:
+        - name: JIRA Issue
+          url: https://codefresh-io.atlassian.net/browse/CR-25268
     - kind: changed
-      description: "Update feature flags"
+      description: "(cfui) Remove the topbar component"
+      links:
+        - name: JIRA Issue
+          url: https://codefresh-io.atlassian.net/browse/CR-25035
 dependencies:
   - name: cf-common
     repository: oci://quay.io/codefresh/charts
diff --git a/codefresh/README.md b/codefresh/README.md
index 1a9efc4ef..94ce56113 100644
--- a/codefresh/README.md
+++ b/codefresh/README.md
@@ -1,6 +1,6 @@
 ## Codefresh On-Premises
 
-![Version: 2.5.0](https://img.shields.io/badge/Version-2.5.0-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
+![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)
 
 Helm chart for deploying [Codefresh On-Premises](https://codefresh.io/docs/docs/getting-started/intro-to-codefresh/) to Kubernetes.
 
@@ -35,15 +35,15 @@ Helm chart for deploying [Codefresh On-Premises](https://codefresh.io/docs/docs/
   - [X-Frame-Options response header](#x-frame-options-response-header)
 - [Configuring OIDC Provider](#configuring-oidc-provider)
 - [Upgrading](#upgrading)
-  - [To 2.0.0](#to-2-0-0)
-  - [To 2.0.12](#to-2-0-12)
-  - [To 2.0.17](#to-2-0-17)
-  - [To 2.1.0](#to-2-1-0)
-  - [To 2.1.7](#to-2-1-7)
-  - [To 2.2.0](#to-2-2-0)
-  - [To 2.3.0](#to-2-3-0)
-  - [To 2.4.0](#to-2-4-0)
-  - [To 2.5.0](#to-2-5-0)
+  - [To 2.0.0](#to-200)
+  - [To 2.0.12](#to-2012)
+  - [To 2.0.17](#to-2017)
+  - [To 2.1.0](#to-210)
+  - [To 2.1.7](#to-217)
+  - [To 2.2.0](#to-220)
+  - [To 2.3.0](#to-230)
+  - [To 2.4.0](#to-240)
+  - [To 2.5.0](#to-250)
 - [Rollback](#rollback)
 - [Troubleshooting](#troubleshooting)
 - [Values](#values)
diff --git a/codefresh/README.md.gotmpl b/codefresh/README.md.gotmpl
index 0d52ee167..01a4515d7 100644
--- a/codefresh/README.md.gotmpl
+++ b/codefresh/README.md.gotmpl
@@ -35,15 +35,15 @@ Helm chart for deploying [Codefresh On-Premises](https://codefresh.io/docs/docs/
   - [X-Frame-Options response header](#x-frame-options-response-header)
 - [Configuring OIDC Provider](#configuring-oidc-provider)
 - [Upgrading](#upgrading)
-  - [To 2.0.0](#to-2-0-0)
-  - [To 2.0.12](#to-2-0-12)
-  - [To 2.0.17](#to-2-0-17)
-  - [To 2.1.0](#to-2-1-0)
-  - [To 2.1.7](#to-2-1-7)
-  - [To 2.2.0](#to-2-2-0)
-  - [To 2.3.0](#to-2-3-0)
-  - [To 2.4.0](#to-2-4-0)
-  - [To 2.5.0](#to-2-5-0)
+  - [To 2.0.0](#to-200)
+  - [To 2.0.12](#to-2012)
+  - [To 2.0.17](#to-2017)
+  - [To 2.1.0](#to-210)
+  - [To 2.1.7](#to-217)
+  - [To 2.2.0](#to-220)
+  - [To 2.3.0](#to-230)
+  - [To 2.4.0](#to-240)
+  - [To 2.5.0](#to-250)
 - [Rollback](#rollback)
 - [Troubleshooting](#troubleshooting)
 - [Values](#values)
diff --git a/codefresh/values.yaml b/codefresh/values.yaml
index e97f22c61..bb5402c70 100644
--- a/codefresh/values.yaml
+++ b/codefresh/values.yaml
@@ -461,7 +461,7 @@ runtimeImages:
   DOCKER_PULLER_IMAGE: quay.io/codefresh/cf-docker-puller:8.0.17
   DOCKER_PUSHER_IMAGE: quay.io/codefresh/cf-docker-pusher:6.0.16
   DOCKER_TAG_PUSHER_IMAGE: quay.io/codefresh/cf-docker-tag-pusher:1.3.14
-  ENGINE_IMAGE: quay.io/codefresh/engine:1.174.7
+  ENGINE_IMAGE: quay.io/codefresh/engine:1.174.12
   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