diff --git a/common/acm/templates/policies/application-policies.yaml b/common/acm/templates/policies/application-policies.yaml
index 4ea3b6006..131e8278b 100644
--- a/common/acm/templates/policies/application-policies.yaml
+++ b/common/acm/templates/policies/application-policies.yaml
@@ -73,12 +73,12 @@ spec:
                         value: {{ $group.name }}
                       - name: global.experimentalCapabilities
                         value: {{ $.Values.global.experimentalCapabilities }}
-                     {{- if $.Values.main.extraParameters }}
-                     {{- range $.Values.main.extraParameters }}
-                      - name: {{ .name }}
-                        value: {{ .value }}
-                     {{- end }}
-                     {{- end }}
+                      {{- range $k, $v := $.Values.extraParametersNested }}
+                      - name: {{ $k }}
+                        value: {{ printf "%s" $v | quote }}
+                      {{- end }}
+                      - name: extraParametersNested
+                        value: {{ $.Values.extraParametersNested }}
                      {{- range .helmOverrides }}
                       - name: {{ .name }}
                         value: {{ .value | quote }}
diff --git a/common/clustergroup/templates/plumbing/applications.yaml b/common/clustergroup/templates/plumbing/applications.yaml
index 29db6f398..f3ceec4f3 100644
--- a/common/clustergroup/templates/plumbing/applications.yaml
+++ b/common/clustergroup/templates/plumbing/applications.yaml
@@ -187,6 +187,8 @@ spec:
           - name: {{ $k }}
             value: {{ printf "%s" $v | quote }}
           {{- end }}
+          - name: extraParametersNested
+            value: {{ $.Values.extraParametersNested }}
           {{- range .overrides }}
           - name: {{ .name }}
             value: {{ .value | quote }}