diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml
index 4e1c754254cf0..54170507f04f1 100644
--- a/manifests/base/kustomization.yaml
+++ b/manifests/base/kustomization.yaml
@@ -5,7 +5,7 @@ kind: Kustomization
 images:
 - name: quay.io/argoproj/argocd
   newName: quay.io/codefresh/argocd
-  newTag: v2.1.0
+  newTag: v2.1.0-cf-CR-6338
 resources:
 - ./application-controller
 - ./dex
diff --git a/manifests/ha/base/kustomization.yaml b/manifests/ha/base/kustomization.yaml
index c96c1f38222c6..455a1f95a1f23 100644
--- a/manifests/ha/base/kustomization.yaml
+++ b/manifests/ha/base/kustomization.yaml
@@ -11,7 +11,7 @@ patchesStrategicMerge:
 images:
 - name: quay.io/argoproj/argocd
   newName: quay.io/codefresh/argocd
-  newTag: v2.1.0
+  newTag: v2.1.0-cf-CR-6338
 resources:
 - ../../base/application-controller
 - ../../base/dex
diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml
index e9ce239273506..2331a6138c559 100644
--- a/manifests/ha/install.yaml
+++ b/manifests/ha/install.yaml
@@ -3684,7 +3684,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.1.0
+        image: quay.io/codefresh/argocd:v2.1.0-cf-CR-6338
         imagePullPolicy: Always
         name: copyutil
         volumeMounts:
@@ -3895,7 +3895,7 @@ spec:
               key: reposerver.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.1.0
+        image: quay.io/codefresh/argocd:v2.1.0-cf-CR-6338
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -4138,7 +4138,7 @@ spec:
               key: server.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.1.0
+        image: quay.io/codefresh/argocd:v2.1.0-cf-CR-6338
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -4334,7 +4334,7 @@ spec:
               key: controller.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.1.0
+        image: quay.io/codefresh/argocd:v2.1.0-cf-CR-6338
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml
index 780f281f913c3..3b1fb10eb5919 100644
--- a/manifests/ha/namespace-install.yaml
+++ b/manifests/ha/namespace-install.yaml
@@ -1071,7 +1071,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.1.0
+        image: quay.io/codefresh/argocd:v2.1.0-cf-CR-6338
         imagePullPolicy: Always
         name: copyutil
         volumeMounts:
@@ -1282,7 +1282,7 @@ spec:
               key: reposerver.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.1.0
+        image: quay.io/codefresh/argocd:v2.1.0-cf-CR-6338
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -1525,7 +1525,7 @@ spec:
               key: server.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.1.0
+        image: quay.io/codefresh/argocd:v2.1.0-cf-CR-6338
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -1721,7 +1721,7 @@ spec:
               key: controller.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.1.0
+        image: quay.io/codefresh/argocd:v2.1.0-cf-CR-6338
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
diff --git a/manifests/install.yaml b/manifests/install.yaml
index 0487d304cfdca..f241a610aca4b 100644
--- a/manifests/install.yaml
+++ b/manifests/install.yaml
@@ -3049,7 +3049,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.1.0
+        image: quay.io/codefresh/argocd:v2.1.0-cf-CR-6338
         imagePullPolicy: Always
         name: copyutil
         volumeMounts:
@@ -3224,7 +3224,7 @@ spec:
               key: reposerver.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.1.0
+        image: quay.io/codefresh/argocd:v2.1.0-cf-CR-6338
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -3463,7 +3463,7 @@ spec:
               key: server.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.1.0
+        image: quay.io/codefresh/argocd:v2.1.0-cf-CR-6338
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -3653,7 +3653,7 @@ spec:
               key: controller.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.1.0
+        image: quay.io/codefresh/argocd:v2.1.0-cf-CR-6338
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml
index 87989e788254e..af0ffde0c95a7 100644
--- a/manifests/namespace-install.yaml
+++ b/manifests/namespace-install.yaml
@@ -436,7 +436,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.1.0
+        image: quay.io/codefresh/argocd:v2.1.0-cf-CR-6338
         imagePullPolicy: Always
         name: copyutil
         volumeMounts:
@@ -611,7 +611,7 @@ spec:
               key: reposerver.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.1.0
+        image: quay.io/codefresh/argocd:v2.1.0-cf-CR-6338
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -850,7 +850,7 @@ spec:
               key: server.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.1.0
+        image: quay.io/codefresh/argocd:v2.1.0-cf-CR-6338
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -1040,7 +1040,7 @@ spec:
               key: controller.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.1.0
+        image: quay.io/codefresh/argocd:v2.1.0-cf-CR-6338
         imagePullPolicy: Always
         livenessProbe:
           httpGet: