diff --git a/charts/apiserver-webhook/templates/config-dynamic-config.yaml b/charts/apiserver-webhook/templates/config-dynamic-config.yaml
index da16a437..630c4158 100644
--- a/charts/apiserver-webhook/templates/config-dynamic-config.yaml
+++ b/charts/apiserver-webhook/templates/config-dynamic-config.yaml
@@ -22,6 +22,7 @@ metadata:
   name: {{ .Release.Name }}-dynamic-config
 data:
 {{- range $key, $val := .Values.conf.apiserver }}
+{{- if and (hasKey $val "file") (hasKey $val "content") }}
   {{ $val.file }}: |
 {{- if kindIs "string" $val.content }}
 {{ indent 4 $val.content }}
@@ -30,3 +31,4 @@ data:
 {{- end }}
 {{- end -}}
 {{- end }}
+{{- end }}
diff --git a/charts/apiserver/templates/configmap-etc.yaml b/charts/apiserver/templates/configmap-etc.yaml
index c62b45d5..2e957e8e 100644
--- a/charts/apiserver/templates/configmap-etc.yaml
+++ b/charts/apiserver/templates/configmap-etc.yaml
@@ -29,6 +29,7 @@ data:
 {{ tuple "etc/_kubeconfig.yaml.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
 {{/* Dynamically added config files */}}
 {{- range $key, $val := .Values.conf }}
+{{- if and (hasKey $val "file") (hasKey $val "content") }}
   {{ $val.file }}: |
 {{- if kindIs "string" $val.content }}
 {{ indent 4 $val.content }}
@@ -37,3 +38,4 @@ data:
 {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}