diff --git a/charts/workload/templates/configs/_env.tpl b/charts/workload/templates/configs/_env.tpl
index 6137725..11a8175 100644
--- a/charts/workload/templates/configs/_env.tpl
+++ b/charts/workload/templates/configs/_env.tpl
@@ -13,7 +13,8 @@ kind: Secret
 stringData:
 {{- end }}
 {{- with $v.data }}
-{{ toYaml . | indent 2}}
+{{- range $k, $v := $v.data }}
+{{ $k }}: {{ $v | quote }}
 {{- end }}
 {{- end }}
 {{- end -}}
diff --git a/charts/workload/templates/ingress/_ingresses.tpl b/charts/workload/templates/ingress/_ingresses.tpl
index 1863be5..aec6056 100644
--- a/charts/workload/templates/ingress/_ingresses.tpl
+++ b/charts/workload/templates/ingress/_ingresses.tpl
@@ -17,11 +17,12 @@ metadata:
 {{- include "lib.metadata" (dict "Context" $ "customName" $customName "annotations" $v.annotations)}}
 spec:
   ingressClassName: {{ $v.class }}
-  rules:
   {{- with $v.rules }}
+  rules:
     {{- tpl ( . | toYaml | nindent 4 | toString) $  }}
   {{- end }}
   {{- with $v.tls }}
+  tls:
     {{- tpl ( . | toYaml | nindent 4 | toString) $  }}
   {{- end }}
 {{- end }}