diff --git a/VERSION b/VERSION
index 56beced9a131d..dcb27a75e17b3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.12.4
+2.12.5
diff --git a/docs/operator-manual/tested-kubernetes-versions.md b/docs/operator-manual/tested-kubernetes-versions.md
index 77a3909bd04f6..b5b6f78f568b8 100644
--- a/docs/operator-manual/tested-kubernetes-versions.md
+++ b/docs/operator-manual/tested-kubernetes-versions.md
@@ -1,5 +1,5 @@
 | Argo CD version | Kubernetes versions |
 |-----------------|---------------------|
-| 2.12 |  |
+| 2.12 | v1.29, v1.28, v1.27, v1.26 |
 | 2.11 | v1.29, v1.28, v1.27, v1.26, v1.25 |
 | 2.10 | v1.28, v1.27, v1.26, v1.25 |
diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml
index 2ce55b94e4423..d682ec6cbcf5e 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.4
+  newTag: v2.12.5
 resources:
 - ./application-controller
 - ./dex
diff --git a/manifests/core-install.yaml b/manifests/core-install.yaml
index 6b7373b3371e9..8ee055005e38a 100644
--- a/manifests/core-install.yaml
+++ b/manifests/core-install.yaml
@@ -21270,7 +21270,7 @@ spec:
               key: applicationsetcontroller.enable.scm.providers
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: Always
         name: argocd-applicationset-controller
         ports:
@@ -21388,7 +21388,7 @@ spec:
         - argocd
         - admin
         - redis-initial-password
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: IfNotPresent
         name: secret-init
         securityContext:
@@ -21641,7 +21641,7 @@ spec:
           value: /helm-working-dir
         - name: HELM_DATA_HOME
           value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -21693,7 +21693,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         name: copyutil
         securityContext:
           allowPrivilegeEscalation: false
@@ -21965,7 +21965,7 @@ spec:
               key: controller.ignore.normalizer.jq.timeout
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: Always
         name: argocd-application-controller
         ports:
diff --git a/manifests/core-install/kustomization.yaml b/manifests/core-install/kustomization.yaml
index 824daf8f146b4..ffbdbe7b11789 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.4
+  newTag: v2.12.5
diff --git a/manifests/ha/base/kustomization.yaml b/manifests/ha/base/kustomization.yaml
index 217c11328b8f5..8eb845a17f2a1 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.4
+  newTag: v2.12.5
 resources:
 - ../../base/application-controller
 - ../../base/applicationset-controller
diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml
index 73b94a462788a..87c57b294b9f9 100644
--- a/manifests/ha/install.yaml
+++ b/manifests/ha/install.yaml
@@ -22613,7 +22613,7 @@ spec:
               key: applicationsetcontroller.enable.scm.providers
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: Always
         name: argocd-applicationset-controller
         ports:
@@ -22736,7 +22736,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: Always
         name: copyutil
         securityContext:
@@ -22818,7 +22818,7 @@ spec:
               key: notificationscontroller.selfservice.enabled
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: Always
         livenessProbe:
           tcpSocket:
@@ -22937,7 +22937,7 @@ spec:
         - argocd
         - admin
         - redis-initial-password
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: IfNotPresent
         name: secret-init
         securityContext:
@@ -23218,7 +23218,7 @@ spec:
           value: /helm-working-dir
         - name: HELM_DATA_HOME
           value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -23270,7 +23270,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         name: copyutil
         securityContext:
           allowPrivilegeEscalation: false
@@ -23594,7 +23594,7 @@ spec:
               key: server.api.content.types
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -23893,7 +23893,7 @@ spec:
               key: controller.ignore.normalizer.jq.timeout
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: Always
         name: argocd-application-controller
         ports:
diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml
index 332e5a93d755e..db5a123f48cc7 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.4
+        image: quay.io/argoproj/argocd:v2.12.5
         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.4
+        image: quay.io/argoproj/argocd:v2.12.5
         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.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: Always
         livenessProbe:
           tcpSocket:
@@ -2012,7 +2012,7 @@ spec:
         - argocd
         - admin
         - redis-initial-password
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         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.4
+        image: quay.io/argoproj/argocd:v2.12.5
         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.4
+        image: quay.io/argoproj/argocd:v2.12.5
         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.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -2968,7 +2968,7 @@ spec:
               key: controller.ignore.normalizer.jq.timeout
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: Always
         name: argocd-application-controller
         ports:
diff --git a/manifests/install.yaml b/manifests/install.yaml
index a7a642a06dcda..e011e6eca6ec1 100644
--- a/manifests/install.yaml
+++ b/manifests/install.yaml
@@ -21730,7 +21730,7 @@ spec:
               key: applicationsetcontroller.enable.scm.providers
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: Always
         name: argocd-applicationset-controller
         ports:
@@ -21853,7 +21853,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: Always
         name: copyutil
         securityContext:
@@ -21935,7 +21935,7 @@ spec:
               key: notificationscontroller.selfservice.enabled
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: Always
         livenessProbe:
           tcpSocket:
@@ -22035,7 +22035,7 @@ spec:
         - argocd
         - admin
         - redis-initial-password
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: IfNotPresent
         name: secret-init
         securityContext:
@@ -22288,7 +22288,7 @@ spec:
           value: /helm-working-dir
         - name: HELM_DATA_HOME
           value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -22340,7 +22340,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         name: copyutil
         securityContext:
           allowPrivilegeEscalation: false
@@ -22662,7 +22662,7 @@ spec:
               key: server.api.content.types
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -22961,7 +22961,7 @@ spec:
               key: controller.ignore.normalizer.jq.timeout
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: Always
         name: argocd-application-controller
         ports:
diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml
index cf173b65ba8be..08ff573976a81 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.4
+        image: quay.io/argoproj/argocd:v2.12.5
         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.4
+        image: quay.io/argoproj/argocd:v2.12.5
         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.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: Always
         livenessProbe:
           tcpSocket:
@@ -1110,7 +1110,7 @@ spec:
         - argocd
         - admin
         - redis-initial-password
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         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.4
+        image: quay.io/argoproj/argocd:v2.12.5
         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.4
+        image: quay.io/argoproj/argocd:v2.12.5
         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.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -2036,7 +2036,7 @@ spec:
               key: controller.ignore.normalizer.jq.timeout
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.12.4
+        image: quay.io/argoproj/argocd:v2.12.5
         imagePullPolicy: Always
         name: argocd-application-controller
         ports: