diff --git a/templates/external-secret.yaml b/templates/external-secret.yaml
index b08b4a7..3d30ea8 100644
--- a/templates/external-secret.yaml
+++ b/templates/external-secret.yaml
@@ -1,8 +1,9 @@
-{{- range $name, $definition := .Values.externalSecrets }}
+{{- with .Values.externalSecrets }}
+{{- range $name, $definition := . }}
 {{- if or ( not ( hasKey $definition "enabled" ) ) $definition.enabled }}
 {{- if ( or $definition.data $definition.dataFrom ) }}
 ---
-{{- if ( and .Capabilities .Capabilities.APIVersions ( .Capabilities.APIVersions.Has "external-secrets.io/v1" ) ) }}
+{{- if ( and $.Capabilities $.Capabilities.APIVersions ( $.Capabilities.APIVersions.Has "external-secrets.io/v1" ) ) }}
 apiVersion: external-secrets.io/v1
 {{- else }}
 apiVersion: external-secrets.io/v1beta1
@@ -34,3 +35,4 @@ spec:
 {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}