diff --git a/diskimage_builder/elements/cloud-init/post-install.d/20-enable-cloud-init b/diskimage_builder/elements/cloud-init/post-install.d/20-enable-cloud-init
index bdf5e208..2de12a39 100755
--- a/diskimage_builder/elements/cloud-init/post-install.d/20-enable-cloud-init
+++ b/diskimage_builder/elements/cloud-init/post-install.d/20-enable-cloud-init
@@ -13,3 +13,10 @@ if [[ "${DIB_INIT_SYSTEM}" == "openrc" ]]; then
     rc-update add cloud-init-local boot
     rc-update add cloud-init default
 fi
+
+if [[ "${DIB_INIT_SYSTEM}" == "systemd" ]]; then
+    systemctl enable cloud-config.service
+    systemctl enable cloud-final.service
+    systemctl enable cloud-init-local.service
+    systemctl enable cloud-init.service
+fi