diff --git a/VERSION b/VERSION
index e4643748ff473..ae93586dde1f0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.12.6
+2.12.7
diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml
index 2fb68cc8ed6e9..b8fcf4a9e78d5 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/argoproj/argocd
-  newTag: v2.12.6
+  newTag: v2.12.7
 resources:
 - ./application-controller
 - ./dex
diff --git a/manifests/core-install.yaml b/manifests/core-install.yaml
index eb768d4c427e2..13946731d2160 100644
--- a/manifests/core-install.yaml
+++ b/manifests/core-install.yaml
@@ -21280,7 +21280,7 @@ spec:
               key: applicationsetcontroller.enable.scm.providers
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         name: argocd-applicationset-controller
         ports:
@@ -21398,7 +21398,7 @@ spec:
         - argocd
         - admin
         - redis-initial-password
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: IfNotPresent
         name: secret-init
         securityContext:
@@ -21651,7 +21651,7 @@ spec:
           value: /helm-working-dir
         - name: HELM_DATA_HOME
           value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -21703,7 +21703,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         name: copyutil
         securityContext:
           allowPrivilegeEscalation: false
@@ -21993,7 +21993,7 @@ spec:
               key: controller.ignore.normalizer.jq.timeout
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         name: argocd-application-controller
         ports:
diff --git a/manifests/core-install/kustomization.yaml b/manifests/core-install/kustomization.yaml
index 553ed4271a4b0..d7273db4f0aba 100644
--- a/manifests/core-install/kustomization.yaml
+++ b/manifests/core-install/kustomization.yaml
@@ -12,4 +12,4 @@ resources:
 images:
 - name: quay.io/argoproj/argocd
   newName: quay.io/argoproj/argocd
-  newTag: v2.12.6
+  newTag: v2.12.7
diff --git a/manifests/ha/base/kustomization.yaml b/manifests/ha/base/kustomization.yaml
index 7f708905c4250..ae76a29d67f26 100644
--- a/manifests/ha/base/kustomization.yaml
+++ b/manifests/ha/base/kustomization.yaml
@@ -12,7 +12,7 @@ patches:
 images:
 - name: quay.io/argoproj/argocd
   newName: quay.io/argoproj/argocd
-  newTag: v2.12.6
+  newTag: v2.12.7
 resources:
 - ../../base/application-controller
 - ../../base/applicationset-controller
diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml
index 71dc5a5041e17..8af984e503ea5 100644
--- a/manifests/ha/install.yaml
+++ b/manifests/ha/install.yaml
@@ -22623,7 +22623,7 @@ spec:
               key: applicationsetcontroller.enable.scm.providers
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         name: argocd-applicationset-controller
         ports:
@@ -22746,7 +22746,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         name: copyutil
         securityContext:
@@ -22828,7 +22828,7 @@ spec:
               key: notificationscontroller.selfservice.enabled
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         livenessProbe:
           tcpSocket:
@@ -22947,7 +22947,7 @@ spec:
         - argocd
         - admin
         - redis-initial-password
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: IfNotPresent
         name: secret-init
         securityContext:
@@ -23228,7 +23228,7 @@ spec:
           value: /helm-working-dir
         - name: HELM_DATA_HOME
           value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -23280,7 +23280,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         name: copyutil
         securityContext:
           allowPrivilegeEscalation: false
@@ -23604,7 +23604,7 @@ spec:
               key: server.api.content.types
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -23921,7 +23921,7 @@ spec:
               key: controller.ignore.normalizer.jq.timeout
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         name: argocd-application-controller
         ports:
diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml
index b48ee36d32322..065034f90b85f 100644
--- a/manifests/ha/namespace-install.yaml
+++ b/manifests/ha/namespace-install.yaml
@@ -1688,7 +1688,7 @@ spec:
               key: applicationsetcontroller.enable.scm.providers
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         name: argocd-applicationset-controller
         ports:
@@ -1811,7 +1811,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         name: copyutil
         securityContext:
@@ -1893,7 +1893,7 @@ spec:
               key: notificationscontroller.selfservice.enabled
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         livenessProbe:
           tcpSocket:
@@ -2012,7 +2012,7 @@ spec:
         - argocd
         - admin
         - redis-initial-password
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: IfNotPresent
         name: secret-init
         securityContext:
@@ -2293,7 +2293,7 @@ spec:
           value: /helm-working-dir
         - name: HELM_DATA_HOME
           value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -2345,7 +2345,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         name: copyutil
         securityContext:
           allowPrivilegeEscalation: false
@@ -2669,7 +2669,7 @@ spec:
               key: server.api.content.types
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -2986,7 +2986,7 @@ spec:
               key: controller.ignore.normalizer.jq.timeout
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         name: argocd-application-controller
         ports:
diff --git a/manifests/install.yaml b/manifests/install.yaml
index 36f0aa217e6a3..c92a932171c31 100644
--- a/manifests/install.yaml
+++ b/manifests/install.yaml
@@ -21740,7 +21740,7 @@ spec:
               key: applicationsetcontroller.enable.scm.providers
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         name: argocd-applicationset-controller
         ports:
@@ -21863,7 +21863,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         name: copyutil
         securityContext:
@@ -21945,7 +21945,7 @@ spec:
               key: notificationscontroller.selfservice.enabled
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         livenessProbe:
           tcpSocket:
@@ -22045,7 +22045,7 @@ spec:
         - argocd
         - admin
         - redis-initial-password
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: IfNotPresent
         name: secret-init
         securityContext:
@@ -22298,7 +22298,7 @@ spec:
           value: /helm-working-dir
         - name: HELM_DATA_HOME
           value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -22350,7 +22350,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         name: copyutil
         securityContext:
           allowPrivilegeEscalation: false
@@ -22672,7 +22672,7 @@ spec:
               key: server.api.content.types
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -22989,7 +22989,7 @@ spec:
               key: controller.ignore.normalizer.jq.timeout
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         name: argocd-application-controller
         ports:
diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml
index e5c72348eae5c..11a1c4403f8cb 100644
--- a/manifests/namespace-install.yaml
+++ b/manifests/namespace-install.yaml
@@ -805,7 +805,7 @@ spec:
               key: applicationsetcontroller.enable.scm.providers
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         name: argocd-applicationset-controller
         ports:
@@ -928,7 +928,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         name: copyutil
         securityContext:
@@ -1010,7 +1010,7 @@ spec:
               key: notificationscontroller.selfservice.enabled
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         livenessProbe:
           tcpSocket:
@@ -1110,7 +1110,7 @@ spec:
         - argocd
         - admin
         - redis-initial-password
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: IfNotPresent
         name: secret-init
         securityContext:
@@ -1363,7 +1363,7 @@ spec:
           value: /helm-working-dir
         - name: HELM_DATA_HOME
           value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -1415,7 +1415,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         name: copyutil
         securityContext:
           allowPrivilegeEscalation: false
@@ -1737,7 +1737,7 @@ spec:
               key: server.api.content.types
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -2054,7 +2054,7 @@ spec:
               key: controller.ignore.normalizer.jq.timeout
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.6
+        image: quay.io/argoproj/argocd:v2.12.7
         imagePullPolicy: Always
         name: argocd-application-controller
         ports: