diff --git a/internal/distro/rhel90/distro.go b/internal/distro/rhel90/distro.go
index b731a97f2..9725bd66c 100644
--- a/internal/distro/rhel90/distro.go
+++ b/internal/distro/rhel90/distro.go
@@ -822,6 +822,12 @@ func newDistro(name string) distro.Distro {
 			"rng-tools",
 			"udisks2",
 		},
+		enabledServices: []string{
+			"cloud-init.service",
+			"cloud-config.service",
+			"cloud-final.service",
+			"cloud-init-local.service",
+		},
 		defaultTarget:           "multi-user.target",
 		kernelOptions:           "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto",
 		bootable:                true,
diff --git a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json b/test/data/manifests/rhel_90-aarch64-qcow2-boot.json
index 79549c848..031a44e87 100644
--- a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-qcow2-boot.json
@@ -3453,6 +3453,12 @@
         {
           "name": "org.osbuild.systemd",
           "options": {
+            "enabled_services": [
+              "cloud-init.service",
+              "cloud-config.service",
+              "cloud-final.service",
+              "cloud-init-local.service"
+            ],
             "default_target": "multi-user.target"
           }
         },
@@ -9570,8 +9576,8 @@
     ],
     "hostname": "localhost.localdomain",
     "image-format": {
-      "type": "qcow2",
-      "compat": "1.1"
+      "compat": "1.1",
+      "type": "qcow2"
     },
     "os-release": {
       "ANSI_COLOR": "0;31",
@@ -10128,10 +10134,6 @@
     "services-disabled": [
       "arp-ethers.service",
       "chrony-wait.service",
-      "cloud-config.service",
-      "cloud-final.service",
-      "cloud-init-local.service",
-      "cloud-init.service",
       "cockpit.socket",
       "console-getty.service",
       "cpupower.service",
@@ -10181,6 +10183,10 @@
       "auditd.service",
       "autovt@.service",
       "chronyd.service",
+      "cloud-config.service",
+      "cloud-final.service",
+      "cloud-init-local.service",
+      "cloud-init.service",
       "crond.service",
       "ctrl-alt-del.target",
       "dbus-broker.service",
diff --git a/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json
index 7d6f23db6..ff0b497a1 100644
--- a/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json
+++ b/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json
@@ -3747,6 +3747,12 @@
         {
           "name": "org.osbuild.systemd",
           "options": {
+            "enabled_services": [
+              "cloud-init.service",
+              "cloud-config.service",
+              "cloud-final.service",
+              "cloud-init-local.service"
+            ],
             "default_target": "multi-user.target"
           }
         },
@@ -10321,8 +10327,8 @@
     ],
     "hostname": "localhost.localdomain",
     "image-format": {
-      "type": "qcow2",
-      "compat": "1.1"
+      "compat": "1.1",
+      "type": "qcow2"
     },
     "os-release": {
       "ANSI_COLOR": "0;31",
@@ -10922,10 +10928,6 @@
     "services-disabled": [
       "arp-ethers.service",
       "chrony-wait.service",
-      "cloud-config.service",
-      "cloud-final.service",
-      "cloud-init-local.service",
-      "cloud-init.service",
       "cockpit.socket",
       "console-getty.service",
       "cpupower.service",
@@ -10976,6 +10978,10 @@
       "auditd.service",
       "autovt@.service",
       "chronyd.service",
+      "cloud-config.service",
+      "cloud-final.service",
+      "cloud-init-local.service",
+      "cloud-init.service",
       "crond.service",
       "ctrl-alt-del.target",
       "dbus-broker.service",
diff --git a/test/data/manifests/rhel_90-s390x-qcow2-boot.json b/test/data/manifests/rhel_90-s390x-qcow2-boot.json
index 9d71f1616..3b35fa312 100644
--- a/test/data/manifests/rhel_90-s390x-qcow2-boot.json
+++ b/test/data/manifests/rhel_90-s390x-qcow2-boot.json
@@ -3567,6 +3567,12 @@
         {
           "name": "org.osbuild.systemd",
           "options": {
+            "enabled_services": [
+              "cloud-init.service",
+              "cloud-config.service",
+              "cloud-final.service",
+              "cloud-init-local.service"
+            ],
             "default_target": "multi-user.target"
           }
         },
@@ -9776,8 +9782,8 @@
     ],
     "hostname": "localhost.localdomain",
     "image-format": {
-      "type": "qcow2",
-      "compat": "1.1"
+      "compat": "1.1",
+      "type": "qcow2"
     },
     "os-release": {
       "ANSI_COLOR": "0;31",
@@ -10350,10 +10356,6 @@
     "services-disabled": [
       "arp-ethers.service",
       "chrony-wait.service",
-      "cloud-config.service",
-      "cloud-final.service",
-      "cloud-init-local.service",
-      "cloud-init.service",
       "cockpit.socket",
       "console-getty.service",
       "debug-shell.service",
@@ -10402,6 +10404,10 @@
       "auditd.service",
       "autovt@.service",
       "chronyd.service",
+      "cloud-config.service",
+      "cloud-final.service",
+      "cloud-init-local.service",
+      "cloud-init.service",
       "cpi.service",
       "crond.service",
       "ctrl-alt-del.target",
diff --git a/test/data/manifests/rhel_90-x86_64-qcow2-boot.json b/test/data/manifests/rhel_90-x86_64-qcow2-boot.json
index 6f5b91b74..be3926408 100644
--- a/test/data/manifests/rhel_90-x86_64-qcow2-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-qcow2-boot.json
@@ -3499,6 +3499,12 @@
         {
           "name": "org.osbuild.systemd",
           "options": {
+            "enabled_services": [
+              "cloud-init.service",
+              "cloud-config.service",
+              "cloud-final.service",
+              "cloud-init-local.service"
+            ],
             "default_target": "multi-user.target"
           }
         },
@@ -9707,8 +9713,8 @@
     ],
     "hostname": "localhost.localdomain",
     "image-format": {
-      "type": "qcow2",
-      "compat": "1.1"
+      "compat": "1.1",
+      "type": "qcow2"
     },
     "os-release": {
       "ANSI_COLOR": "0;31",
@@ -10282,10 +10288,6 @@
     "services-disabled": [
       "arp-ethers.service",
       "chrony-wait.service",
-      "cloud-config.service",
-      "cloud-final.service",
-      "cloud-init-local.service",
-      "cloud-init.service",
       "cockpit.socket",
       "console-getty.service",
       "cpupower.service",
@@ -10335,6 +10337,10 @@
       "auditd.service",
       "autovt@.service",
       "chronyd.service",
+      "cloud-config.service",
+      "cloud-final.service",
+      "cloud-init-local.service",
+      "cloud-init.service",
       "crond.service",
       "ctrl-alt-del.target",
       "dbus-broker.service",