diff --git a/stable/aws-vpc-cni/templates/eniconfig.yaml b/stable/aws-vpc-cni/templates/eniconfig.yaml
new file mode 100644
index 000000000..f4851732d
--- /dev/null
+++ b/stable/aws-vpc-cni/templates/eniconfig.yaml
@@ -0,0 +1,13 @@
+{{- if .Values.crd.create -}}
+{{- range .Values.eni_configs -}}
+apiVersion: crd.k8s.amazonaws.com/v1alpha1
+kind: ENIConfig
+metadata:
+  name: {{ .az }}
+spec:
+  subnet: {{ .subnet }}
+  securityGroups:
+  {{ toYaml .security_groups | indent 2 }}
+---
+{{- end -}}
+{{- end -}}
diff --git a/stable/aws-vpc-cni/values.yaml b/stable/aws-vpc-cni/values.yaml
index 1a96efbd7..8631ca433 100644
--- a/stable/aws-vpc-cni/values.yaml
+++ b/stable/aws-vpc-cni/values.yaml
@@ -135,3 +135,10 @@ affinity:
               operator: NotIn
               values:
                 - fargate
+
+eni_configs: []
+# eni_configs:
+# - az: eu-west-1a
+#   subnet: subnet-0bfb6d177a5fce771
+#   security_groups:
+#   - sg-023feb92f68dc6918