diff --git a/charts/virtual-machine/templates/secret-network-data.yaml b/charts/virtual-machine/templates/secret-network-data.yaml
index beda280..937d950 100644
--- a/charts/virtual-machine/templates/secret-network-data.yaml
+++ b/charts/virtual-machine/templates/secret-network-data.yaml
@@ -4,5 +4,4 @@
   name: {{ .Values.name }}-network-data
 type: Opaque
 data:
-  networkdata:
-    {{ .Values.cloudInit.networkData | toYaml | indent 4 }}
+  networkdata: |{{- .Values.cloudInit.networkData | toYaml | nindent 4 }}
diff --git a/charts/virtual-machine/templates/secret-user-data.yaml b/charts/virtual-machine/templates/secret-user-data.yaml
index 20b77cd..84ef113 100644
--- a/charts/virtual-machine/templates/secret-user-data.yaml
+++ b/charts/virtual-machine/templates/secret-user-data.yaml
@@ -1,14 +1,15 @@
 {{- $userData := .Values.cloudInit.userData }}
-{{- if .Values.configs }}
+{{- if .Values.configFiles }}
 {{- $bootcmd := get $userData "bootcmd" | default list }}
-{{- $_ := set $userData "bootcmd" (concat $bootcmd (list "sudo mkdir /home/{{ .Values.username }}/.dodo" "sudo mount -t virtiofs configs /home/{{ .Values.username }}/.dodo"))}}
+{{- $mkdir := print "sudo mkdir -p /home/" .Values.username "/.dodo" }}
+{{- $mount := print "sudo mount -t virtiofs configs /home/" .Values.username "/.dodo" }}
+{{- $_ := set $userData "bootcmd" (concat $bootcmd (list $mkdir $mount)) }}
 {{- end }}
+{{- $userDataYaml := toYaml $userData }}
 apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Values.name }}-user-data
 type: Opaque
 data:
-  userdata:
-    #cloud-config
-    {{ $userData | toYaml | indent 4 }}
+  userdata: |{{- $userDataYaml | nindent 4 }}