diff --git a/charts/virtual-machine/templates/secret-network-data.yaml b/charts/virtual-machine/templates/secret-network-data.yaml
index 02c002c..d8646e7 100644
--- a/charts/virtual-machine/templates/secret-network-data.yaml
+++ b/charts/virtual-machine/templates/secret-network-data.yaml
@@ -4,4 +4,4 @@
   name: {{ .Values.name }}-network-data
 type: Opaque
 data:
-  networkdata: {{ .Values.cloudInit.networkData}}
+  networkdata: {{ .Values.cloudInit.networkData | toYaml | b64enc }}
diff --git a/charts/virtual-machine/templates/secret-user-data.yaml b/charts/virtual-machine/templates/secret-user-data.yaml
index 3368fde..6e370ef 100644
--- a/charts/virtual-machine/templates/secret-user-data.yaml
+++ b/charts/virtual-machine/templates/secret-user-data.yaml
@@ -1,9 +1,9 @@
 {{- $userData := .Values.cloudInit.userData }}
 {{- if .Values.configFiles }}
-{{- $bootcmd := get $userData "bootcmd" | default list }}
+{{- $runcmd := get $userData "runcmd" | default list }}
 {{- $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)) }}
+{{- $_ := set $userData "runcmd" (concat $runcmd (list $mkdir $mount)) }}
 {{- end }}
 {{- $userDataYaml := print "#cloud-config\n" (toYaml $userData) }}
 apiVersion: v1
diff --git a/charts/virtual-machine/values.yaml b/charts/virtual-machine/values.yaml
index 5a1742a..cf2f6ed 100644
--- a/charts/virtual-machine/values.yaml
+++ b/charts/virtual-machine/values.yaml
@@ -8,5 +8,5 @@
 ports: []
 cloudInit:
   userData: {}
-  networkData: "" # base64 encoded
+  networkData: {}
 configFiles: {}