diff --git a/packages/static/kairos-overlay-files/files/system/oem/00_datasource.yaml b/packages/static/kairos-overlay-files/files/system/oem/00_datasource.yaml
index e01f881..736c8fe 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/00_datasource.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/00_datasource.yaml
@@ -1,3 +1,5 @@
+#cloud-config
+
 name: "Datasource handling"
 stages:
   rootfs.before:
diff --git a/packages/static/kairos-overlay-files/files/system/oem/00_home_dir_owner_fix.yaml b/packages/static/kairos-overlay-files/files/system/oem/00_home_dir_owner_fix.yaml
index bda227e..dae70dd 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/00_home_dir_owner_fix.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/00_home_dir_owner_fix.yaml
@@ -1,3 +1,5 @@
+#cloud-config
+
 name: "Fix home directory permissions (kairos issue #2797)"
 stages:
   network.after:
diff --git a/packages/static/kairos-overlay-files/files/system/oem/00_rootfs.yaml b/packages/static/kairos-overlay-files/files/system/oem/00_rootfs.yaml
index 233da77..537b9c1 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/00_rootfs.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/00_rootfs.yaml
@@ -1,3 +1,5 @@
+# cloud-config
+
 # Rootfs Kairos OEM configuration file
 #
 # This file is part of Kairos and will get reset during upgrades.
diff --git a/packages/static/kairos-overlay-files/files/system/oem/00_rootfs_uki.yaml b/packages/static/kairos-overlay-files/files/system/oem/00_rootfs_uki.yaml
index d96a9d3..b394d21 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/00_rootfs_uki.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/00_rootfs_uki.yaml
@@ -1,3 +1,5 @@
+# cloud-config
+
 # Rootfs Kairos OEM configuration file
 #
 # This file is part of Kairos and will get reset during upgrades.
@@ -58,4 +60,4 @@ stages:
       environment_file: /run/cos/cos-layout.env
       environment:
         RW_PATHS: "/var /etc /srv /home"
-        OVERLAY: "tmpfs:25%"
\ No newline at end of file
+        OVERLAY: "tmpfs:25%"
diff --git a/packages/static/kairos-overlay-files/files/system/oem/02_agent.yaml b/packages/static/kairos-overlay-files/files/system/oem/02_agent.yaml
index 652ab34..af7f7a1 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/02_agent.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/02_agent.yaml
@@ -1,3 +1,5 @@
+# cloud-config
+
 name: "Start agent"
 stages:
   boot:
diff --git a/packages/static/kairos-overlay-files/files/system/oem/02_notify.yaml b/packages/static/kairos-overlay-files/files/system/oem/02_notify.yaml
index 467d535..ddddc4f 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/02_notify.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/02_notify.yaml
@@ -1,3 +1,5 @@
+# cloud-config
+
 name: "Notify Kairos Plugins of Elemental Events"
 stages:
     initramfs:
diff --git a/packages/static/kairos-overlay-files/files/system/oem/03-setupcon.yaml b/packages/static/kairos-overlay-files/files/system/oem/03-setupcon.yaml
index 09cf2e0..b472b10 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/03-setupcon.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/03-setupcon.yaml
@@ -1,3 +1,5 @@
+# cloud-config
+
 name: "Fonts fix for ubuntu"
 stages:
   initramfs.after:
diff --git a/packages/static/kairos-overlay-files/files/system/oem/05_network.yaml b/packages/static/kairos-overlay-files/files/system/oem/05_network.yaml
index bd186f4..e4a3336 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/05_network.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/05_network.yaml
@@ -1,3 +1,5 @@
+# cloud-config
+
 name: "Default network configuration"
 stages:
   rootfs.before:
diff --git a/packages/static/kairos-overlay-files/files/system/oem/08_grub.yaml b/packages/static/kairos-overlay-files/files/system/oem/08_grub.yaml
index 033dd0c..a79a1a8 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/08_grub.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/08_grub.yaml
@@ -1,3 +1,5 @@
+# cloud-config
+
 # Rootfs Kairos OEM configuration file
 #
 # This file is part of Kairos and will get reset during upgrades.
diff --git a/packages/static/kairos-overlay-files/files/system/oem/09_openrc_services.yaml b/packages/static/kairos-overlay-files/files/system/oem/09_openrc_services.yaml
index 37532c7..d8ee917 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/09_openrc_services.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/09_openrc_services.yaml
@@ -1,3 +1,5 @@
+# cloud-config
+
 name: "Create openrc services"
 stages:
   initramfs:
diff --git a/packages/static/kairos-overlay-files/files/system/oem/09_systemd_services.yaml b/packages/static/kairos-overlay-files/files/system/oem/09_systemd_services.yaml
index 2cffa98..6850f00 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/09_systemd_services.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/09_systemd_services.yaml
@@ -1,3 +1,5 @@
+# cloud-config
+
 # Rootfs Kairos OEM configuration file
 #
 # This file is part of Kairos and will get reset during upgrades.
diff --git a/packages/static/kairos-overlay-files/files/system/oem/10_accounting.yaml b/packages/static/kairos-overlay-files/files/system/oem/10_accounting.yaml
index 412de86..b71dde7 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/10_accounting.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/10_accounting.yaml
@@ -1,3 +1,5 @@
+# cloud-config
+
 name: "Default user, permissions and serial login"
 stages:
   initramfs:
diff --git a/packages/static/kairos-overlay-files/files/system/oem/11_RPI.yaml b/packages/static/kairos-overlay-files/files/system/oem/11_RPI.yaml
index 2dd01e2..26437ec 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/11_RPI.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/11_RPI.yaml
@@ -1,4 +1,5 @@
 #cloud-config
+
 name: "RPI configs"
 stages:
   initramfs.before:
diff --git a/packages/static/kairos-overlay-files/files/system/oem/12_nvidia.yaml b/packages/static/kairos-overlay-files/files/system/oem/12_nvidia.yaml
index d0b8625..a9ef043 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/12_nvidia.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/12_nvidia.yaml
@@ -1,3 +1,5 @@
+#cloud-config
+
 name: "Nvidia jetson specific files"
 stages:
     initramfs:
diff --git a/packages/static/kairos-overlay-files/files/system/oem/21_kcrypt.yaml b/packages/static/kairos-overlay-files/files/system/oem/21_kcrypt.yaml
index 89ba01d..ccbface 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/21_kcrypt.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/21_kcrypt.yaml
@@ -1,3 +1,5 @@
+#cloud-config
+
 name: "Kcrypt"
 stages:
   after-upgrade:
diff --git a/packages/static/kairos-overlay-files/files/system/oem/23_c3os.yaml b/packages/static/kairos-overlay-files/files/system/oem/23_c3os.yaml
index 6764a50..d6a5e28 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/23_c3os.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/23_c3os.yaml
@@ -1,3 +1,5 @@
+#cloud-config
+
 name: "c3os sentinel migration"
 stages:
   fs.after:
diff --git a/packages/static/kairos-overlay-files/files/system/oem/25_autologin.yaml b/packages/static/kairos-overlay-files/files/system/oem/25_autologin.yaml
index b75392c..9a04728 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/25_autologin.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/25_autologin.yaml
@@ -1,3 +1,5 @@
+#cloud-config
+
 name: "Root autologin"
 stages:
   initramfs:
@@ -34,4 +36,4 @@ stages:
         - sed -i -e 's/tty1.*//g' /etc/inittab
         - sed -i -e 's/ttyS0.*//g' /etc/inittab
         - echo "tty1::respawn:/sbin/agetty --autologin root -i --noclear tty1" >> /etc/inittab
-        - echo "ttyS0::respawn:/sbin/agetty --autologin root -i --noclear ttyS0" >> /etc/inittab
\ No newline at end of file
+        - echo "ttyS0::respawn:/sbin/agetty --autologin root -i --noclear ttyS0" >> /etc/inittab
diff --git a/packages/static/kairos-overlay-files/files/system/oem/26_selinux.yaml b/packages/static/kairos-overlay-files/files/system/oem/26_selinux.yaml
index 178c038..0b43556 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/26_selinux.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/26_selinux.yaml
@@ -1,3 +1,5 @@
+#cloud-config
+
 name: "SELinux"
 stages:
   initramfs:
diff --git a/packages/static/kairos-overlay-files/files/system/oem/26_vm.yaml b/packages/static/kairos-overlay-files/files/system/oem/26_vm.yaml
index 95b83f4..a3347cb 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/26_vm.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/26_vm.yaml
@@ -1,3 +1,5 @@
+#cloud-config
+
 name: "Enable QEMU tools"
 stages:
   boot:
diff --git a/packages/static/kairos-overlay-files/files/system/oem/29_blacklist.yaml b/packages/static/kairos-overlay-files/files/system/oem/29_blacklist.yaml
index c60508b..8ebb03f 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/29_blacklist.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/29_blacklist.yaml
@@ -1,3 +1,5 @@
+#cloud-config
+
 stages:
   initramfs.before:
     - name: "Blacklist bpfilter on Alpine ( bug: https://github.com/kairos-io/kairos/issues/277 )"
diff --git a/packages/static/kairos-overlay-files/files/system/oem/30_ulimit.yaml b/packages/static/kairos-overlay-files/files/system/oem/30_ulimit.yaml
index aaa98f0..0a0cbe0 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/30_ulimit.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/30_ulimit.yaml
@@ -1,3 +1,5 @@
+#cloud-config
+
 stages:
   boot.before:
     - name: "Setup higher limit for open files"
diff --git a/packages/static/kairos-overlay-files/files/system/oem/31_hosts.yaml b/packages/static/kairos-overlay-files/files/system/oem/31_hosts.yaml
index 3cbddaa..8b27d29 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/31_hosts.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/31_hosts.yaml
@@ -1,3 +1,5 @@
+#cloud-config
+
 stages:
   initramfs.before:
     # For debian based distributions, /etc/hosts is present but empty. This is because the file
diff --git a/packages/static/kairos-overlay-files/files/system/oem/32_profile.yaml b/packages/static/kairos-overlay-files/files/system/oem/32_profile.yaml
index 6f6982a..eb89dc5 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/32_profile.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/32_profile.yaml
@@ -1,3 +1,5 @@
+#cloud-config
+
 name: "Profile extensions"
 stages:
   initramfs:
diff --git a/packages/static/kairos-overlay-files/files/system/oem/50_recovery.yaml b/packages/static/kairos-overlay-files/files/system/oem/50_recovery.yaml
index f1884a2..d1b195e 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/50_recovery.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/50_recovery.yaml
@@ -1,3 +1,5 @@
+#cloud-config
+
 name: "Start recovery on tty1"
 stages:
   initramfs:
diff --git a/packages/static/kairos-overlay-files/files/system/oem/51_reset.yaml b/packages/static/kairos-overlay-files/files/system/oem/51_reset.yaml
index 286c4b6..cfc85ce 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/51_reset.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/51_reset.yaml
@@ -1,3 +1,5 @@
+#cloud-config
+
 name: "Start reset on tty1"
 stages:
   initramfs:
diff --git a/packages/static/kairos-overlay-files/files/system/oem/52_installer.yaml b/packages/static/kairos-overlay-files/files/system/oem/52_installer.yaml
index 8029b52..9430500 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/52_installer.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/52_installer.yaml
@@ -1,3 +1,5 @@
+#cloud-config
+
 name: "Start installer on tty1"
 stages:
   initramfs:
@@ -56,4 +58,4 @@ stages:
         ([ -f /run/cos/live_mode ] || [ -f /run/cos/uki_install_mode ]) && \
         ( [ -e "/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ] || [ -e "/usr/sbin/systemctl" ] || [ -e "/usr/bin/systemctl" ] )
       commands:
-        - systemctl start kairos-webui
\ No newline at end of file
+        - systemctl start kairos-webui
diff --git a/packages/static/kairos-overlay-files/files/system/oem/99_sysext.yaml b/packages/static/kairos-overlay-files/files/system/oem/99_sysext.yaml
index f1db9d9..dc8d95b 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/99_sysext.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/99_sysext.yaml
@@ -1,3 +1,5 @@
+#cloud-config
+
 name: "sysext"
 stages:
   fs.after: