diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 868480bd..4f6a944b 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 2.1.0
+appVersion: 2.1.1
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.17.1
+version: 3.17.2
 home: https://github.com/argoproj/argo-helm
 icon: https://argoproj.github.io/argo-cd/assets/logo.png
 keywords:
@@ -21,4 +21,5 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Fixed]: Add missing parameter 'server.extraContainers' to README.md"
+    - "[Changed]: Upgrade argo-cd image to 2.1.1"
+    - "[Fixed]: Reenabling static assets for the argo-cd server"
diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml
index 9f941c96..05d1a5ae 100755
--- a/charts/argo-cd/templates/argocd-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-server/deployment.yaml
@@ -40,6 +40,10 @@ spec:
         imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.server.image.imagePullPolicy }}
         command:
         - argocd-server
+        {{ if .Values.server.staticAssets.enabled }}
+        - --staticassets
+        - /shared/app
+        {{ end }}
         - --repo-server
         - {{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }}
         {{- if .Values.dex.enabled }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 930827d8..d6ebddbe 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -8,7 +8,7 @@ kubeVersionOverride: ""
 global:
   image:
     repository: quay.io/argoproj/argocd
-    tag: v2.1.0
+    tag: v2.1.1
     imagePullPolicy: IfNotPresent
   ## Annotations applied to all pods
   podAnnotations: {}
@@ -462,6 +462,10 @@ server:
   extraArgs: []
   #  - --insecure
 
+  # This flag is used to either remove or pass the CLI flag --staticassets /shared/app to the argocd-server app
+  staticAssets:
+    enabled: true
+
   ## Environment variables to pass to argocd-server
   ##
   env: []