diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml
index 55366238..9cb4289f 100644
--- a/charts/gitops-runtime/Chart.yaml
+++ b/charts/gitops-runtime/Chart.yaml
@@ -15,9 +15,9 @@ annotations:
   artifacthub.io/alternativeName: "codefresh-gitops-runtime"
 dependencies:
 - name: argo-cd
-  repository: https://codefresh-io.github.io/argo-helm
+  repository: https://argoproj.github.io/argo-helm
   condition: argo-cd.enabled
-  version: 8.0.6-8-cap-v3.0.2-2025-08-12-9c8dfae9
+  version: 8.0.6
 - name: argo-events
   repository: https://codefresh-io.github.io/argo-helm
   version: 2.4.8-cap-CR-29689
diff --git a/charts/gitops-runtime/values-ha.yaml b/charts/gitops-runtime/values-ha.yaml
index 8b84a3d5..8617d6a0 100644
--- a/charts/gitops-runtime/values-ha.yaml
+++ b/charts/gitops-runtime/values-ha.yaml
@@ -70,6 +70,8 @@ cf-argocd-extras:
 argo-cd:
   redis-ha:
     enabled: true
+    image:
+      tag: 7.4.5-alpine
 
   controller:
     replicas: 1
diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml
index 12576bf9..7df8e448 100644
--- a/charts/gitops-runtime/values.yaml
+++ b/charts/gitops-runtime/values.yaml
@@ -236,6 +236,18 @@ sealed-secrets:
 # ArgoCD
 #-----------------------------------------------------------------------------------------------------------------------
 argo-cd:
+  global:
+    image:
+      repository: quay.io/codefresh/argocd
+      tag: v3.0.2-2025-08-12-9c8dfae9
+  redis:
+    image:
+      tag: 7.4.5-alpine
+  dex:
+    image:
+      tag: v2.43.1
+  notifications:
+    enabled: false
   enabled: true
   fullnameOverride: argo-cd
   crds:
@@ -245,6 +257,8 @@ argo-cd:
       timeout.reconciliation: 20s
       accounts.admin: apiKey,login
       application.resourceTrackingMethod: annotation+label
+      application.instanceLabelKey: ""
+      kustomize.setNamespace.enabled: false
       resource.customizations.actions.argoproj.io_Rollout: |
         mergeBuiltinActions: true
         discovery.lua: |