diff --git a/internal/distro/fedora31/distro.go b/internal/distro/fedora31/distro.go
index b4bec1d62..d4d21c6fc 100644
--- a/internal/distro/fedora31/distro.go
+++ b/internal/distro/fedora31/distro.go
@@ -242,6 +242,12 @@ func New() *Fedora31 {
 			"gobject-introspection",
 			"plymouth",
 		},
+		enabledServices: []string{
+			"cloud-init.service",
+			"cloud-config.service",
+			"cloud-final.service",
+			"cloud-init-local.service",
+		},
 		kernelOptions: "ro biosdevname=0 net.ifnames=0",
 		bootable:      true,
 		defaultSize:   2 * GigaByte,
@@ -269,6 +275,12 @@ func New() *Fedora31 {
 		excludedPackages: []string{
 			"dracut-config-rescue",
 		},
+		enabledServices: []string{
+			"cloud-init.service",
+			"cloud-config.service",
+			"cloud-final.service",
+			"cloud-init-local.service",
+		},
 		kernelOptions: "ro biosdevname=0 net.ifnames=0",
 		bootable:      true,
 		defaultSize:   2 * GigaByte,
diff --git a/internal/distro/fedora32/distro.go b/internal/distro/fedora32/distro.go
index 8ce7f88f0..b5f679604 100644
--- a/internal/distro/fedora32/distro.go
+++ b/internal/distro/fedora32/distro.go
@@ -626,6 +626,12 @@ func New() distro.Distro {
 			"gobject-introspection",
 			"plymouth",
 		},
+		enabledServices: []string{
+			"cloud-init.service",
+			"cloud-config.service",
+			"cloud-final.service",
+			"cloud-init-local.service",
+		},
 		kernelOptions: "ro biosdevname=0 net.ifnames=0",
 		bootable:      true,
 		defaultSize:   2 * GigaByte,
@@ -653,6 +659,12 @@ func New() distro.Distro {
 		excludedPackages: []string{
 			"dracut-config-rescue",
 		},
+		enabledServices: []string{
+			"cloud-init.service",
+			"cloud-config.service",
+			"cloud-final.service",
+			"cloud-init-local.service",
+		},
 		kernelOptions: "ro biosdevname=0 net.ifnames=0",
 		bootable:      true,
 		defaultSize:   2 * GigaByte,
diff --git a/test/cases/fedora_31-aarch64-openstack-boot.json b/test/cases/fedora_31-aarch64-openstack-boot.json
index 061830e8f..baf795dec 100644
--- a/test/cases/fedora_31-aarch64-openstack-boot.json
+++ b/test/cases/fedora_31-aarch64-openstack-boot.json
@@ -4128,6 +4128,17 @@
             }
           }
         },
+        {
+          "name": "org.osbuild.systemd",
+          "options": {
+            "enabled_services": [
+              "cloud-init.service",
+              "cloud-config.service",
+              "cloud-final.service",
+              "cloud-init-local.service"
+            ]
+          }
+        },
         {
           "name": "org.osbuild.selinux",
           "options": {
@@ -11639,4 +11650,4 @@
       "unbound-anchor.timer"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/test/cases/fedora_31-aarch64-qcow2-boot.json b/test/cases/fedora_31-aarch64-qcow2-boot.json
index 3004c7555..543733069 100644
--- a/test/cases/fedora_31-aarch64-qcow2-boot.json
+++ b/test/cases/fedora_31-aarch64-qcow2-boot.json
@@ -4009,6 +4009,17 @@
             }
           }
         },
+        {
+          "name": "org.osbuild.systemd",
+          "options": {
+            "enabled_services": [
+              "cloud-init.service",
+              "cloud-config.service",
+              "cloud-final.service",
+              "cloud-init-local.service"
+            ]
+          }
+        },
         {
           "name": "org.osbuild.selinux",
           "options": {
@@ -11328,4 +11339,4 @@
       "unbound-anchor.timer"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/test/cases/fedora_31-x86_64-openstack-boot.json b/test/cases/fedora_31-x86_64-openstack-boot.json
index eb1144bfa..f7346f786 100644
--- a/test/cases/fedora_31-x86_64-openstack-boot.json
+++ b/test/cases/fedora_31-x86_64-openstack-boot.json
@@ -4139,6 +4139,17 @@
             "legacy": "i386-pc"
           }
         },
+        {
+          "name": "org.osbuild.systemd",
+          "options": {
+            "enabled_services": [
+              "cloud-init.service",
+              "cloud-config.service",
+              "cloud-final.service",
+              "cloud-init-local.service"
+            ]
+          }
+        },
         {
           "name": "org.osbuild.selinux",
           "options": {
@@ -11688,10 +11699,6 @@
       "arp-ethers.service",
       "chrony-dnssrv@.timer",
       "chrony-wait.service",
-      "cloud-config.service",
-      "cloud-final.service",
-      "cloud-init-local.service",
-      "cloud-init.service",
       "console-getty.service",
       "debug-shell.service",
       "exit.target",
@@ -11735,6 +11742,10 @@
       "auditd.service",
       "autovt@.service",
       "chronyd.service",
+      "cloud-config.service",
+      "cloud-final.service",
+      "cloud-init-local.service",
+      "cloud-init.service",
       "ctrl-alt-del.target",
       "dbus-broker.service",
       "dbus-org.fedoraproject.FirewallD1.service",
diff --git a/test/cases/fedora_31-x86_64-qcow2-boot.json b/test/cases/fedora_31-x86_64-qcow2-boot.json
index 5d5783f4c..7a5a983ef 100644
--- a/test/cases/fedora_31-x86_64-qcow2-boot.json
+++ b/test/cases/fedora_31-x86_64-qcow2-boot.json
@@ -4069,6 +4069,17 @@
             "legacy": "i386-pc"
           }
         },
+        {
+          "name": "org.osbuild.systemd",
+          "options": {
+            "enabled_services": [
+              "cloud-init.service",
+              "cloud-config.service",
+              "cloud-final.service",
+              "cloud-init-local.service"
+            ]
+          }
+        },
         {
           "name": "org.osbuild.selinux",
           "options": {
@@ -11507,10 +11518,6 @@
       "arp-ethers.service",
       "chrony-dnssrv@.timer",
       "chrony-wait.service",
-      "cloud-config.service",
-      "cloud-final.service",
-      "cloud-init-local.service",
-      "cloud-init.service",
       "console-getty.service",
       "debug-shell.service",
       "exit.target",
@@ -11553,6 +11560,10 @@
       "auditd.service",
       "autovt@.service",
       "chronyd.service",
+      "cloud-config.service",
+      "cloud-final.service",
+      "cloud-init-local.service",
+      "cloud-init.service",
       "ctrl-alt-del.target",
       "dbus-broker.service",
       "dbus-org.freedesktop.nm-dispatcher.service",
diff --git a/test/cases/fedora_31-x86_64-qcow2-customize.json b/test/cases/fedora_31-x86_64-qcow2-customize.json
index 5273942f7..c1e1403d9 100644
--- a/test/cases/fedora_31-x86_64-qcow2-customize.json
+++ b/test/cases/fedora_31-x86_64-qcow2-customize.json
@@ -4172,6 +4172,10 @@
           "name": "org.osbuild.systemd",
           "options": {
             "enabled_services": [
+              "cloud-init.service",
+              "cloud-config.service",
+              "cloud-final.service",
+              "cloud-init-local.service",
               "sshd.socket"
             ],
             "disabled_services": [
@@ -11621,10 +11625,6 @@
       "arp-ethers.service",
       "chrony-dnssrv@.timer",
       "chrony-wait.service",
-      "cloud-config.service",
-      "cloud-final.service",
-      "cloud-init-local.service",
-      "cloud-init.service",
       "console-getty.service",
       "debug-shell.service",
       "exit.target",
@@ -11666,6 +11666,10 @@
       "auditd.service",
       "autovt@.service",
       "chronyd.service",
+      "cloud-config.service",
+      "cloud-final.service",
+      "cloud-init-local.service",
+      "cloud-init.service",
       "ctrl-alt-del.target",
       "dbus-broker.service",
       "dbus-org.freedesktop.nm-dispatcher.service",
diff --git a/test/cases/fedora_32-aarch64-openstack-boot.json b/test/cases/fedora_32-aarch64-openstack-boot.json
index 7631d4ce4..8b8ff17c9 100644
--- a/test/cases/fedora_32-aarch64-openstack-boot.json
+++ b/test/cases/fedora_32-aarch64-openstack-boot.json
@@ -3590,6 +3590,17 @@
             }
           }
         },
+        {
+          "name": "org.osbuild.systemd",
+          "options": {
+            "enabled_services": [
+              "cloud-init.service",
+              "cloud-config.service",
+              "cloud-final.service",
+              "cloud-init-local.service"
+            ]
+          }
+        },
         {
           "name": "org.osbuild.selinux",
           "options": {
@@ -10108,4 +10119,4 @@
       "unbound-anchor.timer"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/test/cases/fedora_32-aarch64-qcow2-boot.json b/test/cases/fedora_32-aarch64-qcow2-boot.json
index 5c5e12949..eda9574f4 100644
--- a/test/cases/fedora_32-aarch64-qcow2-boot.json
+++ b/test/cases/fedora_32-aarch64-qcow2-boot.json
@@ -3380,6 +3380,17 @@
             }
           }
         },
+        {
+          "name": "org.osbuild.systemd",
+          "options": {
+            "enabled_services": [
+              "cloud-init.service",
+              "cloud-config.service",
+              "cloud-final.service",
+              "cloud-init-local.service"
+            ]
+          }
+        },
         {
           "name": "org.osbuild.selinux",
           "options": {
@@ -9565,4 +9576,4 @@
       "unbound-anchor.timer"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/test/cases/fedora_32-x86_64-openstack-boot.json b/test/cases/fedora_32-x86_64-openstack-boot.json
index 2d5be1f82..6d30601d9 100644
--- a/test/cases/fedora_32-x86_64-openstack-boot.json
+++ b/test/cases/fedora_32-x86_64-openstack-boot.json
@@ -3557,6 +3557,17 @@
             "legacy": "i386-pc"
           }
         },
+        {
+          "name": "org.osbuild.systemd",
+          "options": {
+            "enabled_services": [
+              "cloud-init.service",
+              "cloud-config.service",
+              "cloud-final.service",
+              "cloud-init-local.service"
+            ]
+          }
+        },
         {
           "name": "org.osbuild.selinux",
           "options": {
@@ -9950,10 +9961,6 @@
       "arp-ethers.service",
       "chrony-dnssrv@.timer",
       "chrony-wait.service",
-      "cloud-config.service",
-      "cloud-final.service",
-      "cloud-init-local.service",
-      "cloud-init.service",
       "console-getty.service",
       "debug-shell.service",
       "exit.target",
@@ -9996,6 +10003,10 @@
       "auditd.service",
       "autovt@.service",
       "chronyd.service",
+      "cloud-config.service",
+      "cloud-final.service",
+      "cloud-init-local.service",
+      "cloud-init.service",
       "ctrl-alt-del.target",
       "dbus-broker.service",
       "dbus-org.fedoraproject.FirewallD1.service",
diff --git a/test/cases/fedora_32-x86_64-qcow2-boot.json b/test/cases/fedora_32-x86_64-qcow2-boot.json
index 43ea86495..86a28f03d 100644
--- a/test/cases/fedora_32-x86_64-qcow2-boot.json
+++ b/test/cases/fedora_32-x86_64-qcow2-boot.json
@@ -3396,6 +3396,17 @@
             "legacy": "i386-pc"
           }
         },
+        {
+          "name": "org.osbuild.systemd",
+          "options": {
+            "enabled_services": [
+              "cloud-init.service",
+              "cloud-config.service",
+              "cloud-final.service",
+              "cloud-init-local.service"
+            ]
+          }
+        },
         {
           "name": "org.osbuild.selinux",
           "options": {
@@ -9535,10 +9546,6 @@
       "arp-ethers.service",
       "chrony-dnssrv@.timer",
       "chrony-wait.service",
-      "cloud-config.service",
-      "cloud-final.service",
-      "cloud-init-local.service",
-      "cloud-init.service",
       "console-getty.service",
       "console-login-helper-messages-issuegen.service",
       "console-login-helper-messages-motdgen.service",
@@ -9582,6 +9589,10 @@
       "auditd.service",
       "autovt@.service",
       "chronyd.service",
+      "cloud-config.service",
+      "cloud-final.service",
+      "cloud-init-local.service",
+      "cloud-init.service",
       "ctrl-alt-del.target",
       "dbus-broker.service",
       "dbus-org.freedesktop.nm-dispatcher.service",
diff --git a/test/cases/fedora_32-x86_64-qcow2-customize.json b/test/cases/fedora_32-x86_64-qcow2-customize.json
index 3fd4c5a79..35d597d27 100644
--- a/test/cases/fedora_32-x86_64-qcow2-customize.json
+++ b/test/cases/fedora_32-x86_64-qcow2-customize.json
@@ -3499,6 +3499,10 @@
           "name": "org.osbuild.systemd",
           "options": {
             "enabled_services": [
+              "cloud-init.service",
+              "cloud-config.service",
+              "cloud-final.service",
+              "cloud-init-local.service",
               "sshd.socket"
             ],
             "disabled_services": [
@@ -9649,10 +9653,6 @@
       "arp-ethers.service",
       "chrony-dnssrv@.timer",
       "chrony-wait.service",
-      "cloud-config.service",
-      "cloud-final.service",
-      "cloud-init-local.service",
-      "cloud-init.service",
       "console-getty.service",
       "console-login-helper-messages-issuegen.service",
       "console-login-helper-messages-motdgen.service",
@@ -9695,6 +9695,10 @@
       "auditd.service",
       "autovt@.service",
       "chronyd.service",
+      "cloud-config.service",
+      "cloud-final.service",
+      "cloud-init-local.service",
+      "cloud-init.service",
       "ctrl-alt-del.target",
       "dbus-broker.service",
       "dbus-org.freedesktop.nm-dispatcher.service",