diff --git a/debi.sh b/debi.sh
index ca2987f..e32f63b 100755
--- a/debi.sh
+++ b/debi.sh
@@ -914,7 +914,16 @@ EOF
 
 [ "$bbr" = true ] && in_target '{ echo "net.core.default_qdisc=fq"; echo "net.ipv4.tcp_congestion_control=bbr"; } > /etc/sysctl.d/bbr.conf'
 
-[ -n "$cidata" ] && in_target 'echo "{ datasource_list: [ NoCloud ], datasource: { ConfigDrive: { dsmode: disabled }, NoCloud: { fs_label: ~, dsmode: local } } }" > /etc/cloud/cloud.cfg.d/99_mandate_nocloud.cfg'
+[ -n "$cidata" ] && {
+    in_target 'echo "datasource_list: [ NoCloud ]" > /etc/cloud/cloud.cfg.d/91_set_datasource.cfg'
+    in_target 'echo "" >> /etc/cloud/cloud.cfg.d/91_set_datasource.cfg'
+    in_target 'echo "datasource:" >> /etc/cloud/cloud.cfg.d/91_set_datasource.cfg'
+    in_target 'echo "  ConfigDrive:" >> /etc/cloud/cloud.cfg.d/91_set_datasource.cfg'
+    in_target 'echo "    dsmode: disabled" >> /etc/cloud/cloud.cfg.d/91_set_datasource.cfg'
+    in_target 'echo "  NoCloud:" >> /etc/cloud/cloud.cfg.d/91_set_datasource.cfg'
+    in_target 'echo "    fs_label: ~" >> /etc/cloud/cloud.cfg.d/91_set_datasource.cfg'
+    in_target 'echo "    dsmode: local" >> /etc/cloud/cloud.cfg.d/91_set_datasource.cfg'
+}
 
 late_command='true'
 [ -n "$in_target_script" ] && late_command="$late_command; in-target sh -c '$in_target_script'"