diff --git a/common/templates/_extra_ingress.tpl b/common/templates/_extra_ingress.tpl
index 8fa2c8661351fdc31d28b938f2f4b70b10b4953f..8760a611cbdc1bbcdf46548750c29c3b031da4ec 100644
--- a/common/templates/_extra_ingress.tpl
+++ b/common/templates/_extra_ingress.tpl
@@ -17,4 +17,5 @@ spec:
     {{- (include "common.extra-ingress.rules" .) | nindent 4 }}
   tls:
     {{- (include "common.extra-ingress.tls" .) | nindent 4 }}
+---
 {{- end }}
diff --git a/common/templates/_secret.tpl b/common/templates/_secret.tpl
index 0436b3f4f8e6f0093603e070a209d3cbe1ca7dcf..e24c203d4750fae49f6ddc05041bceee49bb15e9 100644
--- a/common/templates/_secret.tpl
+++ b/common/templates/_secret.tpl
@@ -6,4 +6,5 @@ metadata:
 type: {{ .Values.type | default "Opaque" }}
 data:
   {{- (include "common.secret.data" .) | nindent 2 }}
+---
 {{- end }}
diff --git a/example/templates/extra_ingress.yaml b/example/templates/extra_ingress.yaml
index 9e6f3bc96ac49726ccae2a6fc960490f679d0062..6d6f98941a93113b7a2039b53d239c9dd53a9643 100644
--- a/example/templates/extra_ingress.yaml
+++ b/example/templates/extra_ingress.yaml
@@ -1,3 +1,3 @@
 {{- if .Values.extraIngress }}
-{{ include "common.extra-ingress.ingress" (merge . (dict "Values" .Values.extraIngress)) }}
+{{ include "common.extra-ingress.ingress" (dict "Values" .Values.extraIngress "Chart" .Chart "Release" .Release) }}
 {{- end }}
diff --git a/example/templates/secret.yaml b/example/templates/secret.yaml
deleted file mode 100644
index 6ddac33ef20683f97642978778a424c191b9c844..0000000000000000000000000000000000000000
--- a/example/templates/secret.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-{{- if .Values.secret }}
-{{ include "common.secret.secret" (merge . (dict "Values" .Values.secret)) }}
-{{- end }}
diff --git a/example/templates/secrets.yaml b/example/templates/secrets.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7ffc71e2f87be2d2e9a962a7d30fec382c5dd7e4
--- /dev/null
+++ b/example/templates/secrets.yaml
@@ -0,0 +1,6 @@
+{{- if .Values.secrets.secret0 }}
+{{ include "common.secret.secret" (dict "Values" .Values.secrets.secret0 "Chart" .Chart "Release" .Release) }}
+{{- end }}
+{{- if .Values.secrets.secret1 }}
+{{ include "common.secret.secret" (dict "Values" .Values.secrets.secret1 "Chart" .Chart "Release" .Release) }}
+{{- end }}
diff --git a/example/values.yaml b/example/values.yaml
index 73ad8794f2cb1b21edc52f35b2f8082dd17c60e8..d59c0e0820ac33a2bdeb5766af8313dc5dcde9c2 100644
--- a/example/values.yaml
+++ b/example/values.yaml
@@ -17,9 +17,16 @@ extraIngress:
         - test.com
       secretName: test-tls
 
-secret:
-  name: example-secret
-  type: Generic
-  data:
-    username: dXNlcm5hbWU= # Base64-encoded 'username'
-    password: cGFzc3dvcmQ= # Base64-encoded 'password'
+secrets:
+  secret0:
+    name: example-secret0
+    data:
+      username: dXNlcm5hbWU= # Base64-encoded 'username'
+      password: cGFzc3dvcmQ= # Base64-encoded 'password'
+
+  secret1:
+    name: example-secret1
+    type: Opaque
+    data:
+      username: example
+      password: example