diff --git a/charts/portainer/templates/deployment.yaml b/charts/portainer/templates/deployment.yaml
index 4bb8c2d..6425d7c 100644
--- a/charts/portainer/templates/deployment.yaml
+++ b/charts/portainer/templates/deployment.yaml
@@ -65,8 +65,8 @@ spec:
           {{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.edgeNodePort))) }}
           - '--tunnel-port={{ .Values.service.edgeNodePort }}'
           {{- end }}
-          {{- with .Values.feature.flags }}
-            {{- toYaml . | nindent 8 }}
+          {{- range .Values.feature.flags }}
+          - {{ . | squote }}
           {{- end }}
           volumeMounts:
             {{- if .Values.persistence.enabled }}
diff --git a/charts/portainer/values.yaml b/charts/portainer/values.yaml
index 7472b66..0d67a6e 100644
--- a/charts/portainer/values.yaml
+++ b/charts/portainer/values.yaml
@@ -51,7 +51,7 @@ mtls:
   existingSecret: ""
 
 feature:
-  flags: {}
+  flags: []
 
 ingress:
   enabled: false