diff --git a/VERSION b/VERSION
index 85c0a6a965e4c..6ece8e7d5151a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.8.16
+2.8.17
diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml
index adf2a251511b4..fabd06b6997c5 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.16
+  newTag: v2.8.17
 resources:
 - ./application-controller
 - ./dex
diff --git a/manifests/core-install.yaml b/manifests/core-install.yaml
index f1835da3bb5a1..181e046be180e 100644
--- a/manifests/core-install.yaml
+++ b/manifests/core-install.yaml
@@ -18874,7 +18874,7 @@ spec:
               key: applicationsetcontroller.allowed.scm.providers
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.16
+        image: quay.io/argoproj/argocd:v2.8.17
         imagePullPolicy: Always
         name: argocd-applicationset-controller
         ports:
@@ -19174,7 +19174,7 @@ spec:
           value: /helm-working-dir
         - name: HELM_DATA_HOME
           value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.8.16
+        image: quay.io/argoproj/argocd:v2.8.17
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -19226,7 +19226,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.8.16
+        image: quay.io/argoproj/argocd:v2.8.17
         name: copyutil
         securityContext:
           allowPrivilegeEscalation: false
@@ -19451,7 +19451,7 @@ spec:
               key: controller.ignore.normalizer.jq.timeout
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.16
+        image: quay.io/argoproj/argocd:v2.8.17
         imagePullPolicy: Always
         name: argocd-application-controller
         ports:
diff --git a/manifests/core-install/kustomization.yaml b/manifests/core-install/kustomization.yaml
index ac9bb87ea7842..429d6c48dd82a 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.16
+  newTag: v2.8.17
diff --git a/manifests/ha/base/kustomization.yaml b/manifests/ha/base/kustomization.yaml
index e301328519f48..80e8aa293d866 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.16
+  newTag: v2.8.17
 resources:
 - ../../base/application-controller
 - ../../base/applicationset-controller
diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml
index d85dafeb97cd3..021539b1f0d15 100644
--- a/manifests/ha/install.yaml
+++ b/manifests/ha/install.yaml
@@ -20123,7 +20123,7 @@ spec:
               key: applicationsetcontroller.allowed.scm.providers
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.16
+        image: quay.io/argoproj/argocd:v2.8.17
         imagePullPolicy: Always
         name: argocd-applicationset-controller
         ports:
@@ -20246,7 +20246,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.8.16
+        image: quay.io/argoproj/argocd:v2.8.17
         imagePullPolicy: Always
         name: copyutil
         securityContext:
@@ -20322,7 +20322,7 @@ spec:
               key: application.namespaces
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.16
+        image: quay.io/argoproj/argocd:v2.8.17
         imagePullPolicy: Always
         livenessProbe:
           tcpSocket:
@@ -20648,7 +20648,7 @@ spec:
           value: /helm-working-dir
         - name: HELM_DATA_HOME
           value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.8.16
+        image: quay.io/argoproj/argocd:v2.8.17
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -20700,7 +20700,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.8.16
+        image: quay.io/argoproj/argocd:v2.8.17
         name: copyutil
         securityContext:
           allowPrivilegeEscalation: false
@@ -20995,7 +20995,7 @@ spec:
               key: server.api.content.types
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.16
+        image: quay.io/argoproj/argocd:v2.8.17
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -21247,7 +21247,7 @@ spec:
               key: controller.ignore.normalizer.jq.timeout
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.16
+        image: quay.io/argoproj/argocd:v2.8.17
         imagePullPolicy: Always
         name: argocd-application-controller
         ports:
diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml
index 3b063330b52da..adde5cc188fd5 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.16
+        image: quay.io/argoproj/argocd:v2.8.17
         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.16
+        image: quay.io/argoproj/argocd:v2.8.17
         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.16
+        image: quay.io/argoproj/argocd:v2.8.17
         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.16
+        image: quay.io/argoproj/argocd:v2.8.17
         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.16
+        image: quay.io/argoproj/argocd:v2.8.17
         name: copyutil
         securityContext:
           allowPrivilegeEscalation: false
@@ -2507,7 +2507,7 @@ spec:
               key: server.api.content.types
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.16
+        image: quay.io/argoproj/argocd:v2.8.17
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -2759,7 +2759,7 @@ spec:
               key: controller.ignore.normalizer.jq.timeout
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.16
+        image: quay.io/argoproj/argocd:v2.8.17
         imagePullPolicy: Always
         name: argocd-application-controller
         ports:
diff --git a/manifests/install.yaml b/manifests/install.yaml
index d76c8937154ed..2f9e0078141f1 100644
--- a/manifests/install.yaml
+++ b/manifests/install.yaml
@@ -19224,7 +19224,7 @@ spec:
               key: applicationsetcontroller.allowed.scm.providers
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.16
+        image: quay.io/argoproj/argocd:v2.8.17
         imagePullPolicy: Always
         name: argocd-applicationset-controller
         ports:
@@ -19347,7 +19347,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.8.16
+        image: quay.io/argoproj/argocd:v2.8.17
         imagePullPolicy: Always
         name: copyutil
         securityContext:
@@ -19423,7 +19423,7 @@ spec:
               key: application.namespaces
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.16
+        image: quay.io/argoproj/argocd:v2.8.17
         imagePullPolicy: Always
         livenessProbe:
           tcpSocket:
@@ -19705,7 +19705,7 @@ spec:
           value: /helm-working-dir
         - name: HELM_DATA_HOME
           value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.8.16
+        image: quay.io/argoproj/argocd:v2.8.17
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -19757,7 +19757,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.8.16
+        image: quay.io/argoproj/argocd:v2.8.17
         name: copyutil
         securityContext:
           allowPrivilegeEscalation: false
@@ -20050,7 +20050,7 @@ spec:
               key: server.api.content.types
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.16
+        image: quay.io/argoproj/argocd:v2.8.17
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -20302,7 +20302,7 @@ spec:
               key: controller.ignore.normalizer.jq.timeout
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.16
+        image: quay.io/argoproj/argocd:v2.8.17
         imagePullPolicy: Always
         name: argocd-application-controller
         ports:
diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml
index 0c1222d8ed8ab..74d395205f07a 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.16
+        image: quay.io/argoproj/argocd:v2.8.17
         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.16
+        image: quay.io/argoproj/argocd:v2.8.17
         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.16
+        image: quay.io/argoproj/argocd:v2.8.17
         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.16
+        image: quay.io/argoproj/argocd:v2.8.17
         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.16
+        image: quay.io/argoproj/argocd:v2.8.17
         name: copyutil
         securityContext:
           allowPrivilegeEscalation: false
@@ -1562,7 +1562,7 @@ spec:
               key: server.api.content.types
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.16
+        image: quay.io/argoproj/argocd:v2.8.17
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -1814,7 +1814,7 @@ spec:
               key: controller.ignore.normalizer.jq.timeout
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.8.16
+        image: quay.io/argoproj/argocd:v2.8.17
         imagePullPolicy: Always
         name: argocd-application-controller
         ports: