diff --git a/VERSION b/VERSION
index e43686acc3662..bcd0f91fe45b7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.8.6
+2.8.7
diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml
index 4aff1bced1ddd..ed6b77aa17f60 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.8.6
+  newTag: v2.8.7
 resources:
 - ./application-controller
 - ./dex
diff --git a/manifests/core-install.yaml b/manifests/core-install.yaml
index a3bbfa892808f..53387204730e4 100644
--- a/manifests/core-install.yaml
+++ b/manifests/core-install.yaml
@@ -18880,7 +18880,7 @@ spec:
               key: applicationsetcontroller.allowed.scm.providers
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         name: argocd-applicationset-controller
         ports:
@@ -19180,7 +19180,7 @@ spec:
           value: /helm-working-dir
         - name: HELM_DATA_HOME
           value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -19232,7 +19232,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         name: copyutil
         securityContext:
           allowPrivilegeEscalation: false
@@ -19451,7 +19451,7 @@ spec:
               key: controller.kubectl.parallelism.limit
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         name: argocd-application-controller
         ports:
diff --git a/manifests/core-install/kustomization.yaml b/manifests/core-install/kustomization.yaml
index f77fecacfb751..40094c51036b3 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.8.6
+  newTag: v2.8.7
diff --git a/manifests/ha/base/kustomization.yaml b/manifests/ha/base/kustomization.yaml
index 9736c118329d2..8a81e2bd72bec 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.8.6
+  newTag: v2.8.7
 resources:
 - ../../base/application-controller
 - ../../base/applicationset-controller
diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml
index db4bda840fc57..099bfa51707de 100644
--- a/manifests/ha/install.yaml
+++ b/manifests/ha/install.yaml
@@ -20129,7 +20129,7 @@ spec:
               key: applicationsetcontroller.allowed.scm.providers
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         name: argocd-applicationset-controller
         ports:
@@ -20252,7 +20252,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         name: copyutil
         securityContext:
@@ -20328,7 +20328,7 @@ spec:
               key: application.namespaces
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         livenessProbe:
           tcpSocket:
@@ -20654,7 +20654,7 @@ spec:
           value: /helm-working-dir
         - name: HELM_DATA_HOME
           value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -20706,7 +20706,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         name: copyutil
         securityContext:
           allowPrivilegeEscalation: false
@@ -20995,7 +20995,7 @@ spec:
               key: server.enable.proxy.extension
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -21241,7 +21241,7 @@ spec:
               key: controller.kubectl.parallelism.limit
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         name: argocd-application-controller
         ports:
diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml
index 3cfd53d595175..36a2dc9741eae 100644
--- a/manifests/ha/namespace-install.yaml
+++ b/manifests/ha/namespace-install.yaml
@@ -1635,7 +1635,7 @@ spec:
               key: applicationsetcontroller.allowed.scm.providers
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         name: argocd-applicationset-controller
         ports:
@@ -1758,7 +1758,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         name: copyutil
         securityContext:
@@ -1834,7 +1834,7 @@ spec:
               key: application.namespaces
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         livenessProbe:
           tcpSocket:
@@ -2160,7 +2160,7 @@ spec:
           value: /helm-working-dir
         - name: HELM_DATA_HOME
           value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -2212,7 +2212,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         name: copyutil
         securityContext:
           allowPrivilegeEscalation: false
@@ -2501,7 +2501,7 @@ spec:
               key: server.enable.proxy.extension
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -2747,7 +2747,7 @@ spec:
               key: controller.kubectl.parallelism.limit
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         name: argocd-application-controller
         ports:
diff --git a/manifests/install.yaml b/manifests/install.yaml
index 6d2a03f0d6e9e..ae2c05fd63f27 100644
--- a/manifests/install.yaml
+++ b/manifests/install.yaml
@@ -19230,7 +19230,7 @@ spec:
               key: applicationsetcontroller.allowed.scm.providers
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         name: argocd-applicationset-controller
         ports:
@@ -19353,7 +19353,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         name: copyutil
         securityContext:
@@ -19429,7 +19429,7 @@ spec:
               key: application.namespaces
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         livenessProbe:
           tcpSocket:
@@ -19711,7 +19711,7 @@ spec:
           value: /helm-working-dir
         - name: HELM_DATA_HOME
           value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -19763,7 +19763,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         name: copyutil
         securityContext:
           allowPrivilegeEscalation: false
@@ -20050,7 +20050,7 @@ spec:
               key: server.enable.proxy.extension
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -20296,7 +20296,7 @@ spec:
               key: controller.kubectl.parallelism.limit
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         name: argocd-application-controller
         ports:
diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml
index 25176fd4b72c3..8af8734ea4765 100644
--- a/manifests/namespace-install.yaml
+++ b/manifests/namespace-install.yaml
@@ -736,7 +736,7 @@ spec:
               key: applicationsetcontroller.allowed.scm.providers
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         name: argocd-applicationset-controller
         ports:
@@ -859,7 +859,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         name: copyutil
         securityContext:
@@ -935,7 +935,7 @@ spec:
               key: application.namespaces
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         livenessProbe:
           tcpSocket:
@@ -1217,7 +1217,7 @@ spec:
           value: /helm-working-dir
         - name: HELM_DATA_HOME
           value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -1269,7 +1269,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         name: copyutil
         securityContext:
           allowPrivilegeEscalation: false
@@ -1556,7 +1556,7 @@ spec:
               key: server.enable.proxy.extension
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -1802,7 +1802,7 @@ spec:
               key: controller.kubectl.parallelism.limit
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.6
+        image: quay.io/argoproj/argocd:v2.8.7
         imagePullPolicy: Always
         name: argocd-application-controller
         ports: