diff --git a/charts/argo-cd/templates/argocd-application-controller/metrics.yaml b/charts/argo-cd/templates/argocd-application-controller/metrics.yaml
index aa748ddd..10f389d8 100644
--- a/charts/argo-cd/templates/argocd-application-controller/metrics.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/metrics.yaml
@@ -23,12 +23,11 @@ spec:
   type: {{ .Values.controller.metrics.service.type }}
   {{- if and .Values.controller.metrics.service.clusterIP (eq .Values.controller.metrics.service.type "ClusterIP") }}
   clusterIP: {{ .Values.controller.metrics.service.clusterIP }}
+  {{- with .Values.controller.metrics.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ . }}
   {{- end }}
-  {{- if .Values.controller.metrics.service.ipFamilyPolicy }}
-  ipFamilyPolicy: {{ .Values.controller.metrics.service.ipFamilyPolicy }}
-  {{- end }}
-  {{- if .Values.controller.metrics.service.ipFamilies }}
-  ipFamilies: {{ .Values.controller.metrics.service.ipFamilies | toYaml | nindent 2 }}
+  {{- with .Values.controller.metrics.service.ipFamilies }}
+  ipFamilies: {{ toYaml . | nindent 4 }}
   {{- end }}
   ports:
   - name: {{ .Values.controller.metrics.service.portName }}
diff --git a/charts/argo-cd/templates/argocd-applicationset/metrics.yaml b/charts/argo-cd/templates/argocd-applicationset/metrics.yaml
index 8caf9e27..c2ea8393 100644
--- a/charts/argo-cd/templates/argocd-applicationset/metrics.yaml
+++ b/charts/argo-cd/templates/argocd-applicationset/metrics.yaml
@@ -23,12 +23,11 @@ spec:
   type: {{ .Values.applicationSet.metrics.service.type }}
   {{- if and .Values.applicationSet.metrics.service.clusterIP (eq .Values.applicationSet.metrics.service.type "ClusterIP") }}
   clusterIP: {{ .Values.applicationSet.metrics.service.clusterIP }}
+  {{- with .Values.applicationSet.metrics.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ . }}
   {{- end }}
-  {{- if .Values.applicationSet.metrics.service.ipFamilyPolicy }}
-  ipFamilyPolicy: {{ .Values.applicationSet.metrics.service.ipFamilyPolicy }}
-  {{- end }}
-  {{- if .Values.applicationSet.metrics.service.ipFamilies }}
-  ipFamilies: {{ .Values.applicationSet.metrics.service.ipFamilies | toYaml | nindent 2 }}
+  {{- with .Values.applicationSet.metrics.service.ipFamilies }}
+  ipFamilies: {{ toYaml . | nindent 4 }}
   {{- end }}
   ports:
   - name:  {{ .Values.applicationSet.metrics.service.portName }}
diff --git a/charts/argo-cd/templates/argocd-applicationset/service.yaml b/charts/argo-cd/templates/argocd-applicationset/service.yaml
index aab2a219..db9ad7e6 100644
--- a/charts/argo-cd/templates/argocd-applicationset/service.yaml
+++ b/charts/argo-cd/templates/argocd-applicationset/service.yaml
@@ -17,11 +17,11 @@ metadata:
 {{- end }}
 spec:
   type: {{ .Values.applicationSet.service.type }}
-{{- if .Values.applicationSet.service.ipFamilyPolicy }}
-  ipFamilyPolicy: {{ .Values.applicationSet.service.ipFamilyPolicy }}
+{{- with .Values.applicationSet.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ . }}
 {{- end }}
-{{- if .Values.applicationSet.service.ipFamilies }}
-  ipFamilies: {{ .Values.applicationSet.service.ipFamilies | toYaml | nindent 2 }}
+{{- with .Values.applicationSet.service.ipFamilies }}
+  ipFamilies: {{ toYaml . | nindent 4 }}
 {{- end }}
   ports:
   - name: {{ .Values.applicationSet.service.portName }}
diff --git a/charts/argo-cd/templates/argocd-notifications/metrics.yaml b/charts/argo-cd/templates/argocd-notifications/metrics.yaml
index 37a082e3..994b3c22 100644
--- a/charts/argo-cd/templates/argocd-notifications/metrics.yaml
+++ b/charts/argo-cd/templates/argocd-notifications/metrics.yaml
@@ -24,11 +24,11 @@ spec:
   {{- if and .Values.notifications.metrics.service.clusterIP (eq .Values.notifications.metrics.service.type "ClusterIP") }}
   clusterIP: {{ .Values.notifications.metrics.service.clusterIP }}
   {{- end }}
-  {{- if .Values.notifications.metrics.service.ipFamilyPolicy }}
-  ipFamilyPolicy: {{ .Values.notifications.metrics.service.ipFamilyPolicy }}
+  {{- with .Values.notifications.metrics.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ . }}
   {{- end }}
-  {{- if .Values.notifications.metrics.service.ipFamilies }}
-  ipFamilies: {{ .Values.notifications.metrics.service.ipFamilies | toYaml | nindent 2 }}
+  {{- with .Values.notifications.metrics.service.ipFamilies }}
+  ipFamilies: {{ toYaml . | nindent 4 }}
   {{- end }}
   selector:
     {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.notifications.name) | nindent 6 }}
diff --git a/charts/argo-cd/templates/argocd-repo-server/metrics.yaml b/charts/argo-cd/templates/argocd-repo-server/metrics.yaml
index e269f204..6b64ef8a 100644
--- a/charts/argo-cd/templates/argocd-repo-server/metrics.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/metrics.yaml
@@ -24,11 +24,11 @@ spec:
   {{- if and .Values.repoServer.metrics.service.clusterIP (eq .Values.repoServer.metrics.service.type "ClusterIP") }}
   clusterIP: {{ .Values.repoServer.metrics.service.clusterIP }}
   {{- end }}
-  {{- if .Values.repoServer.metrics.service.ipFamilyPolicy }}
-  ipFamilyPolicy: {{ .Values.repoServer.metrics.service.ipFamilyPolicy }}
+  {{- with .Values.repoServer.metrics.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ . }}
   {{- end }}
-  {{- if .Values.repoServer.metrics.service.ipFamilies }}
-  ipFamilies: {{ .Values.repoServer.metrics.service.ipFamilies | toYaml | nindent 2 }}
+  {{- with .Values.repoServer.metrics.service.ipFamilies }}
+  ipFamilies: {{ toYaml . | nindent 4 }}
   {{- end }}
   ports:
   - name: {{ .Values.repoServer.metrics.service.portName }}
diff --git a/charts/argo-cd/templates/argocd-repo-server/service.yaml b/charts/argo-cd/templates/argocd-repo-server/service.yaml
index 140602e5..308636e2 100644
--- a/charts/argo-cd/templates/argocd-repo-server/service.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/service.yaml
@@ -15,11 +15,11 @@ metadata:
   name: {{ template "argo-cd.repoServer.fullname" . }}
   namespace: {{ .Release.Namespace | quote }}
 spec:
-{{- if .Values.repoServer.service.ipFamilyPolicy }}
-  ipFamilyPolicy: {{ .Values.repoServer.service.ipFamilyPolicy }}
+{{- with .Values.repoServer.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ . }}
 {{- end }}
-{{- if .Values.repoServer.service.ipFamilies }}
-  ipFamilies: {{ .Values.repoServer.service.ipFamilies | toYaml | nindent 2 }}
+{{- with .Values.repoServer.service.ipFamilies }}
+  ipFamilies: {{ toYaml . | nindent 4 }}
 {{- end }}
   ports:
   - name: {{ .Values.repoServer.service.portName }}
diff --git a/charts/argo-cd/templates/argocd-server/aws/service.yaml b/charts/argo-cd/templates/argocd-server/aws/service.yaml
index b583c537..8b383b69 100644
--- a/charts/argo-cd/templates/argocd-server/aws/service.yaml
+++ b/charts/argo-cd/templates/argocd-server/aws/service.yaml
@@ -9,12 +9,12 @@ metadata:
   name: {{ template "argo-cd.server.fullname" . }}-grpc
   namespace: {{ .Release.Namespace | quote }}
 spec:
-{{- if .Values.server.service.ipFamilyPolicy }}
-  ipFamilyPolicy: {{ .Values.server.service.ipFamilyPolicy }}
-{{- end }}
-{{- if .Values.server.service.ipFamilies }}
-  ipFamilies: {{ .Values.server.service.ipFamilies | toYaml | nindent 2 }}
-{{- end }}
+  {{- with .Values.server.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ . }}
+  {{- end }}
+  {{- with .Values.server.service.ipFamilies }}
+  ipFamilies: {{ toYaml . | nindent 4 }}
+  {{- end }}
   ports:
   - name: {{ .Values.server.service.servicePortHttpName }}
     protocol: TCP
diff --git a/charts/argo-cd/templates/argocd-server/metrics.yaml b/charts/argo-cd/templates/argocd-server/metrics.yaml
index dcf0c8e6..8e6f4096 100644
--- a/charts/argo-cd/templates/argocd-server/metrics.yaml
+++ b/charts/argo-cd/templates/argocd-server/metrics.yaml
@@ -24,11 +24,11 @@ spec:
   {{- if and .Values.server.metrics.service.clusterIP (eq .Values.server.metrics.service.type "ClusterIP") }}
   clusterIP: {{ .Values.server.metrics.service.clusterIP }}
   {{- end }}
-  {{- if .Values.server.metrics.service.ipFamilyPolicy }}
-  ipFamilyPolicy: {{ .Values.server.metrics.service.ipFamilyPolicy }}
+  {{- with .Values.server.metrics.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ . }}
   {{- end }}
-  {{- if .Values.server.metrics.service.ipFamilies }}
-  ipFamilies: {{ .Values.server.metrics.service.ipFamilies | toYaml | nindent 2 }}
+  {{- with .Values.server.metrics.service.ipFamilies }}
+  ipFamilies: {{ toYaml . | nindent 4 }}
   {{- end }}
   ports:
   - name: {{ .Values.server.metrics.service.portName }}
diff --git a/charts/argo-cd/templates/argocd-server/service.yaml b/charts/argo-cd/templates/argocd-server/service.yaml
index 6f6d7c9a..00fff542 100644
--- a/charts/argo-cd/templates/argocd-server/service.yaml
+++ b/charts/argo-cd/templates/argocd-server/service.yaml
@@ -16,12 +16,12 @@ metadata:
 {{- end }}
 spec:
   type: {{ .Values.server.service.type }}
-{{- if .Values.server.service.ipFamilyPolicy }}
-  ipFamilyPolicy: {{ .Values.server.service.ipFamilyPolicy }}
-{{- end }}
-{{- if .Values.server.service.ipFamilies }}
-  ipFamilies: {{ .Values.server.service.ipFamilies | toYaml | nindent 2 }}
-{{- end }}
+  {{- with .Values.server.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ . }}
+  {{- end }}
+  {{- with .Values.server.service.ipFamilies }}
+  ipFamilies: {{ toYaml . | nindent 4 }}
+  {{- end }}
   ports:
   - name: {{ .Values.server.service.servicePortHttpName }}
     protocol: TCP
diff --git a/charts/argo-cd/templates/dex/service.yaml b/charts/argo-cd/templates/dex/service.yaml
index 5d7d58c3..c3ed2282 100644
--- a/charts/argo-cd/templates/dex/service.yaml
+++ b/charts/argo-cd/templates/dex/service.yaml
@@ -16,11 +16,11 @@ metadata:
 {{- toYaml .Values.dex.metrics.service.labels | nindent 4 }}
 {{- end }}
 spec:
-{{- if .Values.dex.serviceIpFamilyPolicy }}
-  ipFamilyPolicy: {{ .Values.dex.serviceIpFamilyPolicy }}
+{{- with .Values.dex.serviceIpFamilyPolicy }}
+  ipFamilyPolicy: {{ . }}
 {{- end }}
-{{- if .Values.dex.serviceIpFamilies }}
-  ipFamilies: {{ .Values.dex.serviceIpFamilies | toYaml | nindent 2 }}
+{{- with .Values.dex.serviceIpFamilies }}
+  ipFamilies: {{ toYaml . | nindent 4 }}
 {{- end }}
   ports:
   - name: {{ .Values.dex.servicePortHttpName }}
diff --git a/charts/argo-cd/templates/redis/service.yaml b/charts/argo-cd/templates/redis/service.yaml
index 3d7c2470..851314b0 100644
--- a/charts/argo-cd/templates/redis/service.yaml
+++ b/charts/argo-cd/templates/redis/service.yaml
@@ -17,11 +17,11 @@ metadata:
     {{- end }}
   {{- end }}
 spec:
-  {{- if .Values.redis.serviceIpFamilyPolicy }}
-  ipFamilyPolicy: {{ .Values.redis.serviceIpFamilyPolicy }}
+  {{- with .Values.redis.serviceIpFamilyPolicy }}
+  ipFamilyPolicy: {{ . }}
   {{- end }}
-  {{- if .Values.redis.serviceIpFamilies }}
-  ipFamilies: {{ .Values.redis.serviceIpFamilies | toYaml | nindent 2 }}
+  {{- with .Values.redis.serviceIpFamilies }}
+  ipFamilies: {{ toYaml . | nindent 4 }}
   {{- end }}
   ports:
   - name: redis