diff --git a/codefresh/Chart.lock b/codefresh/Chart.lock
index 7c8f22d3a..d06c56ceb 100644
--- a/codefresh/Chart.lock
+++ b/codefresh/Chart.lock
@@ -64,58 +64,58 @@ dependencies:
   version: 1.15.0
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.279.8
+  version: 21.279.9-onprem-71444dd
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.279.8
+  version: 21.279.9-onprem-71444dd
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.279.8
+  version: 21.279.9-onprem-71444dd
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.279.8
+  version: 21.279.9-onprem-71444dd
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.279.8
+  version: 21.279.9-onprem-71444dd
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.279.8
+  version: 21.279.9-onprem-71444dd
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.279.8
+  version: 21.279.9-onprem-71444dd
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.279.8
+  version: 21.279.9-onprem-71444dd
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.279.8
+  version: 21.279.9-onprem-71444dd
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.279.8
+  version: 21.279.9-onprem-71444dd
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.279.8
+  version: 21.279.9-onprem-71444dd
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.279.8
+  version: 21.279.9-onprem-71444dd
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.279.8
+  version: 21.279.9-onprem-71444dd
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.279.8
+  version: 21.279.9-onprem-71444dd
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.279.8
+  version: 21.279.9-onprem-71444dd
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.279.8
+  version: 21.279.9-onprem-71444dd
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.279.8
+  version: 21.279.9-onprem-71444dd
 - name: cfapi
   repository: oci://quay.io/codefresh/charts
-  version: 21.279.8
+  version: 21.279.9-onprem-71444dd
 - name: cfui
   repository: oci://quay.io/codefresh/charts
   version: 14.98.29
@@ -133,7 +133,7 @@ dependencies:
   version: 0.20.2
 - name: hermes
   repository: oci://quay.io/codefresh/charts
-  version: 0.21.20
+  version: 0.21.21
 - name: nomios
   repository: oci://quay.io/codefresh/charts
   version: 0.11.11
@@ -167,5 +167,5 @@ dependencies:
 - name: salesforce-reporter
   repository: oci://quay.io/codefresh/charts
   version: 1.30.11
-digest: sha256:4e7b52e0ee6d81e910d3e7352b14cb5a7d01c51a7bcd7a8e455c53cc2564d982
-generated: "2025-08-29T15:06:33.935106+03:00"
+digest: sha256:19519e066a8a7be90cf8dc6654bfee69e1d04b9ff380f13b64129cbcd47ae426
+generated: "2025-09-08T16:43:30.934512+03:00"
diff --git a/codefresh/Chart.yaml b/codefresh/Chart.yaml
index 622c9b297..6a3b672a4 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.13
+version: 2.8.14
 keywords:
   - codefresh
 home: https://codefresh.io/
@@ -18,13 +18,8 @@ annotations:
   artifacthub.io/containsSecurityUpdates: "true"
   # supported kinds are added, changed, deprecated, removed, fixed and security.
   artifacthub.io/changes: |
-    - 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
+    - kind: security
+      description: "Migrated cf-api to @node-saml/passport-saml to fix critical security vulnerability"
 dependencies:
   - name: cf-common
     repository: oci://quay.io/codefresh/charts
@@ -111,92 +106,92 @@ dependencies:
     condition: gitops-dashboard-manager.enabled
   - name: cfapi
     alias: cfapi
-    version: "~21.279.0"
+    version: "21.279.9-onprem-71444dd"
     repository: oci://quay.io/codefresh/charts
     condition: cfapi.enabled
   - name: cfapi
     alias: cfapi-auth
-    version: "~21.279.0"
+    version: "21.279.9-onprem-71444dd"
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-auth.enabled
   - name: cfapi
     alias: cfapi-internal
-    version: "~21.279.0"
+    version: "21.279.9-onprem-71444dd"
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-internal.enabled
   - name: cfapi
     alias: cfapi-ws
-    version: "~21.279.0"
+    version: "21.279.9-onprem-71444dd"
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-ws.enabled
   - name: cfapi
     alias: cfapi-admin
-    version: "~21.279.0"
+    version: "21.279.9-onprem-71444dd"
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-admin.enabled
   - name: cfapi
     alias: cfapi-endpoints
-    version: "~21.279.0"
+    version: "21.279.9-onprem-71444dd"
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-endpoints.enabled
   - name: cfapi
     alias: cfapi-terminators
-    version: "~21.279.0"
+    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.0"
+    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.0"
+    version: "21.279.9-onprem-71444dd"
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-buildmanager.enabled
   - name: cfapi
     alias: cfapi-cacheevictmanager
-    version: "~21.279.0"
+    version: "21.279.9-onprem-71444dd"
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-cacheevictmanager.enabled
   - name: cfapi
     alias: cfapi-eventsmanagersubscriptions
-    version: "~21.279.0"
+    version: "21.279.9-onprem-71444dd"
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-eventsmanagersubscriptions.enabled
   - name: cfapi
     alias: cfapi-kubernetesresourcemonitor
-    version: "~21.279.0"
+    version: "21.279.9-onprem-71444dd"
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-kubernetesresourcemonitor.enabled
   - name: cfapi
     alias: cfapi-environments
-    version: "~21.279.0"
+    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.0"
+    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.0"
+    version: "21.279.9-onprem-71444dd"
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-downloadlogmanager.enabled
   - name: cfapi
     alias: cfapi-teams
-    version: "~21.279.0"
+    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.0"
+    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.0"
+    version: "21.279.9-onprem-71444dd"
     repository: oci://quay.io/codefresh/charts
     condition: cfapi-test-reporting.enabled
   - name: cfui