diff --git a/internal/distro/rhel90/pipelines.go b/internal/distro/rhel90/pipelines.go
index 800d925c9..7829a5823 100644
--- a/internal/distro/rhel90/pipelines.go
+++ b/internal/distro/rhel90/pipelines.go
@@ -5,6 +5,7 @@ import (
 	"math/rand"
 	"path"
 	"path/filepath"
+	"strings"
 
 	"github.com/osbuild/osbuild-composer/internal/blueprint"
 	"github.com/osbuild/osbuild-composer/internal/common"
@@ -40,13 +41,13 @@ func qcow2Pipelines(t *imageType, customizations *blueprint.Customizations, opti
 	return pipelines, nil
 }
 
-func prependKernelCmdlineStage(pipeline *osbuild.Pipeline, t *imageType, pt *disk.PartitionTable) *osbuild.Pipeline {
+func prependKernelCmdlineStage(pipeline *osbuild.Pipeline, kernelOptions string, pt *disk.PartitionTable) *osbuild.Pipeline {
 	rootFs := pt.FindMountable("/")
 	if rootFs == nil {
 		panic("root filesystem must be defined for kernel-cmdline stage, this is a programming error")
 	}
 	rootFsUUID := rootFs.GetFSSpec().UUID
-	kernelStage := osbuild.NewKernelCmdlineStage(osbuild.NewKernelCmdlineStageOptions(rootFsUUID, t.kernelOptions))
+	kernelStage := osbuild.NewKernelCmdlineStage(osbuild.NewKernelCmdlineStageOptions(rootFsUUID, kernelOptions))
 	pipeline.Stages = append([]*osbuild.Stage{kernelStage}, pipeline.Stages...)
 	return pipeline
 }
@@ -301,7 +302,7 @@ func edgeImagePipelines(t *imageType, filename string, options distro.ImageOptio
 	}
 
 	// prepare ostree deployment tree
-	treePipeline := ostreeDeployPipeline(t, partitionTable, ostreeRepoPath, nil, "", rng, options)
+	treePipeline := ostreeDeployPipeline(t, partitionTable, ostreeRepoPath, rng, options)
 	pipelines = append(pipelines, *treePipeline)
 
 	// make raw image from tree
@@ -528,10 +529,17 @@ func osPipeline(t *imageType,
 	}
 
 	if pt != nil {
-		p = prependKernelCmdlineStage(p, t, pt)
+		kernelOptions := osbuild.GenImageKernelOptions(pt)
+		if t.kernelOptions != "" {
+			kernelOptions = append(kernelOptions, t.kernelOptions)
+		}
+		if bpKernel := c.GetKernel(); bpKernel.Append != "" {
+			kernelOptions = append(kernelOptions, bpKernel.Append)
+		}
+		p = prependKernelCmdlineStage(p, strings.Join(kernelOptions, " "), pt)
 		p.AddStage(osbuild.NewFSTabStage(osbuild.NewFSTabStageOptions(pt)))
 		kernelVer := rpmmd.GetVerStrFromPackageSpecListPanic(bpPackages, c.GetKernel().Name)
-		p.AddStage(bootloaderConfigStage(t, *pt, c.GetKernel(), kernelVer, false, false))
+		p.AddStage(bootloaderConfigStage(t, *pt, kernelVer, false, false))
 	}
 
 	p.AddStage(osbuild.NewSELinuxStage(selinuxStageOptions(false)))
@@ -797,8 +805,6 @@ func ostreeDeployPipeline(
 	t *imageType,
 	pt *disk.PartitionTable,
 	repoPath string,
-	kernel *blueprint.KernelCustomization,
-	kernelVer string,
 	rng *rand.Rand,
 	options distro.ImageOptions,
 ) *osbuild.Pipeline {
@@ -873,7 +879,7 @@ func ostreeDeployPipeline(
 
 	// TODO: Add users?
 
-	p.AddStage(bootloaderConfigStage(t, *pt, kernel, kernelVer, true, true))
+	p.AddStage(bootloaderConfigStage(t, *pt, "", true, true))
 
 	p.AddStage(osbuild.NewOSTreeSelinuxStage(
 		&osbuild.OSTreeSelinuxStageOptions{
@@ -1008,16 +1014,15 @@ func qemuPipeline(inputPipelineName, inputFilename, outputFilename, format, qcow
 	return p
 }
 
-func bootloaderConfigStage(t *imageType, partitionTable disk.PartitionTable, kernel *blueprint.KernelCustomization, kernelVer string, install, greenboot bool) *osbuild.Stage {
+func bootloaderConfigStage(t *imageType, partitionTable disk.PartitionTable, kernelVer string, install, greenboot bool) *osbuild.Stage {
 	if t.arch.name == distro.S390xArchName {
 		return osbuild.NewZiplStage(new(osbuild.ZiplStageOptions))
 	}
 
-	kernelOptions := t.kernelOptions
 	uefi := t.supportsUEFI()
 	legacy := t.arch.legacy
 
-	options := osbuild.NewGrub2StageOptions(&partitionTable, kernelOptions, kernel, kernelVer, uefi, legacy, t.arch.distro.vendor, install)
+	options := osbuild.NewGrub2StageOptionsUnified(&partitionTable, kernelVer, uefi, legacy, t.arch.distro.vendor, install)
 	options.Greenboot = greenboot
 
 	return osbuild.NewGRUB2Stage(options)
diff --git a/test/data/manifests/centos_9-aarch64-ami-boot.json b/test/data/manifests/centos_9-aarch64-ami-boot.json
index 6e86b61e1..f638ffdd1 100644
--- a/test/data/manifests/centos_9-aarch64-ami-boot.json
+++ b/test/data/manifests/centos_9-aarch64-ami-boot.json
@@ -982,12 +982,12 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0",
               "uefi": {
                 "vendor": "centos",
                 "unified": true
               },
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64",
+              "write_cmdline": false
             }
           },
           {
@@ -9475,7 +9475,6 @@
       "profile-id": "sssd"
     },
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
     },
     "bootloader": "unknown",
diff --git a/test/data/manifests/centos_9-aarch64-openstack-boot.json b/test/data/manifests/centos_9-aarch64-openstack-boot.json
index a7bb8ec7d..78142812d 100644
--- a/test/data/manifests/centos_9-aarch64-openstack-boot.json
+++ b/test/data/manifests/centos_9-aarch64-openstack-boot.json
@@ -889,12 +889,12 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "ro net.ifnames=0",
               "uefi": {
                 "vendor": "centos",
                 "unified": true
               },
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64",
+              "write_cmdline": false
             }
           },
           {
@@ -9541,7 +9541,6 @@
   "image-info": {
     "/etc/resolv.conf": [],
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro net.ifnames=0",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
     },
     "bootloader": "unknown",
diff --git a/test/data/manifests/centos_9-aarch64-qcow2-boot.json b/test/data/manifests/centos_9-aarch64-qcow2-boot.json
index 942752246..3d5f5ba53 100644
--- a/test/data/manifests/centos_9-aarch64-qcow2-boot.json
+++ b/test/data/manifests/centos_9-aarch64-qcow2-boot.json
@@ -897,12 +897,12 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
               "uefi": {
                 "vendor": "centos",
                 "unified": true
               },
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64",
+              "write_cmdline": false
             }
           },
           {
@@ -9608,7 +9608,6 @@
   "image-info": {
     "/etc/resolv.conf": [],
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
     },
     "bootloader": "unknown",
diff --git a/test/data/manifests/centos_9-aarch64-qcow2_customize-boot.json b/test/data/manifests/centos_9-aarch64-qcow2_customize-boot.json
index 9b0724aa2..8b6ca24de 100644
--- a/test/data/manifests/centos_9-aarch64-qcow2_customize-boot.json
+++ b/test/data/manifests/centos_9-aarch64-qcow2_customize-boot.json
@@ -345,7 +345,7 @@
             "type": "org.osbuild.kernel-cmdline",
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0"
+              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug"
             }
           },
           {
@@ -1208,12 +1208,12 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
               "uefi": {
                 "vendor": "centos",
                 "unified": true
               },
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64",
+              "write_cmdline": false
             }
           },
           {
@@ -11952,7 +11952,6 @@
   "image-info": {
     "/etc/resolv.conf": [],
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
     },
     "bootloader": "unknown",
@@ -11963,7 +11962,7 @@
         "grub_users": "$grub_users",
         "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img",
         "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff",
-        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
+        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
         "title": "CentOS Stream (0-rescue-ffffffffffffffffffffffffffffffff) 9",
         "version": "0-rescue-ffffffffffffffffffffffffffffffff"
       },
@@ -11973,7 +11972,7 @@
         "grub_users": "$grub_users",
         "initrd": "/initramfs-5.14.0-55.el9.aarch64.img $tuned_initrd",
         "linux": "/vmlinuz-5.14.0-55.el9.aarch64",
-        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 $tuned_params",
+        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug $tuned_params",
         "title": "CentOS Stream (5.14.0-55.el9.aarch64) 9",
         "version": "5.14.0-55.el9.aarch64"
       }
diff --git a/test/data/manifests/centos_9-ppc64le-qcow2-boot.json b/test/data/manifests/centos_9-ppc64le-qcow2-boot.json
index 90ce5ab37..984358002 100644
--- a/test/data/manifests/centos_9-ppc64le-qcow2-boot.json
+++ b/test/data/manifests/centos_9-ppc64le-qcow2-boot.json
@@ -952,9 +952,9 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
               "legacy": "powerpc-ieee1275",
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le",
+              "write_cmdline": false
             }
           },
           {
@@ -10440,7 +10440,6 @@
       ]
     },
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le"
     },
     "bootloader": "unknown",
diff --git a/test/data/manifests/centos_9-ppc64le-qcow2_customize-boot.json b/test/data/manifests/centos_9-ppc64le-qcow2_customize-boot.json
index db2ab2818..e3196e772 100644
--- a/test/data/manifests/centos_9-ppc64le-qcow2_customize-boot.json
+++ b/test/data/manifests/centos_9-ppc64le-qcow2_customize-boot.json
@@ -356,7 +356,7 @@
             "type": "org.osbuild.kernel-cmdline",
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0"
+              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug"
             }
           },
           {
@@ -1270,9 +1270,9 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
               "legacy": "powerpc-ieee1275",
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le",
+              "write_cmdline": false
             }
           },
           {
@@ -12861,7 +12861,6 @@
       ]
     },
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le"
     },
     "bootloader": "unknown",
@@ -12872,7 +12871,7 @@
         "grub_users": "$grub_users",
         "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img",
         "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff",
-        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
+        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
         "title": "CentOS Stream (0-rescue-ffffffffffffffffffffffffffffffff) 9",
         "version": "0-rescue-ffffffffffffffffffffffffffffffff"
       },
@@ -12882,7 +12881,7 @@
         "grub_users": "$grub_users",
         "initrd": "/initramfs-5.14.0-55.el9.ppc64le.img $tuned_initrd",
         "linux": "/vmlinuz-5.14.0-55.el9.ppc64le",
-        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 $tuned_params",
+        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug $tuned_params",
         "title": "CentOS Stream (5.14.0-55.el9.ppc64le) 9",
         "version": "5.14.0-55.el9.ppc64le"
       }
diff --git a/test/data/manifests/centos_9-s390x-qcow2-boot.json b/test/data/manifests/centos_9-s390x-qcow2-boot.json
index 7822d02cf..ff82b6d1a 100644
--- a/test/data/manifests/centos_9-s390x-qcow2-boot.json
+++ b/test/data/manifests/centos_9-s390x-qcow2-boot.json
@@ -11455,7 +11455,7 @@
         "grub_arg": "--unrestricted",
         "grub_class": "kernel",
         "grub_users": "$grub_users",
-        "id": "-20220219190204-5.14.0-55.el9.s390x",
+        "id": "-20220222233022-5.14.0-55.el9.s390x",
         "initrd": "/boot/initramfs-5.14.0-55.el9.s390x.img",
         "linux": "/boot/vmlinuz-5.14.0-55.el9.s390x",
         "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
diff --git a/test/data/manifests/centos_9-s390x-qcow2_customize-boot.json b/test/data/manifests/centos_9-s390x-qcow2_customize-boot.json
index 152df4210..bfb58cc4b 100644
--- a/test/data/manifests/centos_9-s390x-qcow2_customize-boot.json
+++ b/test/data/manifests/centos_9-s390x-qcow2_customize-boot.json
@@ -459,7 +459,7 @@
             "type": "org.osbuild.kernel-cmdline",
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0"
+              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug"
             }
           },
           {
@@ -13689,10 +13689,10 @@
         "grub_arg": "--unrestricted",
         "grub_class": "kernel",
         "grub_users": "$grub_users",
-        "id": "-20220219190404-0-rescue-ffffffffffffffffffffffffffffffff",
+        "id": "-20220222233227-0-rescue-ffffffffffffffffffffffffffffffff",
         "initrd": "/boot/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img",
         "linux": "/boot/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff",
-        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
+        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
         "title": " (0-rescue-ffffffffffffffffffffffffffffffff)",
         "version": "0-rescue-ffffffffffffffffffffffffffffffff"
       },
@@ -13700,10 +13700,10 @@
         "grub_arg": "--unrestricted",
         "grub_class": "kernel",
         "grub_users": "$grub_users",
-        "id": "-20220219190404-5.14.0-55.el9.s390x",
+        "id": "-20220222233227-5.14.0-55.el9.s390x",
         "initrd": "/boot/initramfs-5.14.0-55.el9.s390x.img",
         "linux": "/boot/vmlinuz-5.14.0-55.el9.s390x",
-        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
+        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
         "title": " (5.14.0-55.el9.s390x)",
         "version": "5.14.0-55.el9.s390x"
       }
diff --git a/test/data/manifests/centos_9-x86_64-ami-boot.json b/test/data/manifests/centos_9-x86_64-ami-boot.json
index 06ce58fd9..3440efe7b 100644
--- a/test/data/manifests/centos_9-x86_64-ami-boot.json
+++ b/test/data/manifests/centos_9-x86_64-ami-boot.json
@@ -981,9 +981,9 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295",
               "legacy": "i386-pc",
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
+              "write_cmdline": false
             }
           },
           {
@@ -9194,7 +9194,6 @@
       "profile-id": "sssd"
     },
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
     },
     "bootloader": "grub",
diff --git a/test/data/manifests/centos_9-x86_64-openstack-boot.json b/test/data/manifests/centos_9-x86_64-openstack-boot.json
index 4e7dc4b10..2ec1cee17 100644
--- a/test/data/manifests/centos_9-x86_64-openstack-boot.json
+++ b/test/data/manifests/centos_9-x86_64-openstack-boot.json
@@ -929,12 +929,13 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "ro net.ifnames=0",
               "legacy": "i386-pc",
               "uefi": {
-                "vendor": "centos"
+                "vendor": "centos",
+                "unified": true
               },
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
+              "write_cmdline": false
             }
           },
           {
@@ -9990,7 +9991,6 @@
   "image-info": {
     "/etc/resolv.conf": [],
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro net.ifnames=0",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
     },
     "bootloader": "grub",
diff --git a/test/data/manifests/centos_9-x86_64-qcow2-boot.json b/test/data/manifests/centos_9-x86_64-qcow2-boot.json
index aed79d919..e5d0eaab9 100644
--- a/test/data/manifests/centos_9-x86_64-qcow2-boot.json
+++ b/test/data/manifests/centos_9-x86_64-qcow2-boot.json
@@ -924,12 +924,13 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
               "legacy": "i386-pc",
               "uefi": {
-                "vendor": "centos"
+                "vendor": "centos",
+                "unified": true
               },
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
+              "write_cmdline": false
             }
           },
           {
@@ -9875,7 +9876,6 @@
   "image-info": {
     "/etc/resolv.conf": [],
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
     },
     "bootloader": "grub",
diff --git a/test/data/manifests/centos_9-x86_64-qcow2_customize-boot.json b/test/data/manifests/centos_9-x86_64-qcow2_customize-boot.json
index 096c85392..ac8ba3303 100644
--- a/test/data/manifests/centos_9-x86_64-qcow2_customize-boot.json
+++ b/test/data/manifests/centos_9-x86_64-qcow2_customize-boot.json
@@ -366,7 +366,7 @@
             "type": "org.osbuild.kernel-cmdline",
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0"
+              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug"
             }
           },
           {
@@ -1250,12 +1250,13 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
               "legacy": "i386-pc",
               "uefi": {
-                "vendor": "centos"
+                "vendor": "centos",
+                "unified": true
               },
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
+              "write_cmdline": false
             }
           },
           {
@@ -12420,7 +12421,6 @@
   "image-info": {
     "/etc/resolv.conf": [],
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
     },
     "bootloader": "grub",
@@ -12431,7 +12431,7 @@
         "grub_users": "$grub_users",
         "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img",
         "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff",
-        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
+        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
         "title": "CentOS Stream (0-rescue-ffffffffffffffffffffffffffffffff) 9",
         "version": "0-rescue-ffffffffffffffffffffffffffffffff"
       },
@@ -12441,7 +12441,7 @@
         "grub_users": "$grub_users",
         "initrd": "/initramfs-5.14.0-55.el9.x86_64.img $tuned_initrd",
         "linux": "/vmlinuz-5.14.0-55.el9.x86_64",
-        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 $tuned_params",
+        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug $tuned_params",
         "title": "CentOS Stream (5.14.0-55.el9.x86_64) 9",
         "version": "5.14.0-55.el9.x86_64"
       }
diff --git a/test/data/manifests/centos_9-x86_64-vhd-boot.json b/test/data/manifests/centos_9-x86_64-vhd-boot.json
index 9292e922a..b3295145e 100644
--- a/test/data/manifests/centos_9-x86_64-vhd-boot.json
+++ b/test/data/manifests/centos_9-x86_64-vhd-boot.json
@@ -928,12 +928,13 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0",
               "legacy": "i386-pc",
               "uefi": {
-                "vendor": "centos"
+                "vendor": "centos",
+                "unified": true
               },
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
+              "write_cmdline": false
             }
           },
           {
@@ -9884,7 +9885,6 @@
   "image-info": {
     "/etc/resolv.conf": [],
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
     },
     "bootloader": "grub",
diff --git a/test/data/manifests/centos_9-x86_64-vmdk-boot.json b/test/data/manifests/centos_9-x86_64-vmdk-boot.json
index e327785ad..5bf3fa873 100644
--- a/test/data/manifests/centos_9-x86_64-vmdk-boot.json
+++ b/test/data/manifests/centos_9-x86_64-vmdk-boot.json
@@ -895,12 +895,13 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "ro net.ifnames=0",
               "legacy": "i386-pc",
               "uefi": {
-                "vendor": "centos"
+                "vendor": "centos",
+                "unified": true
               },
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
+              "write_cmdline": false
             }
           },
           {
@@ -9570,7 +9571,6 @@
   "image-info": {
     "/etc/resolv.conf": [],
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro net.ifnames=0",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
     },
     "bootloader": "grub",
diff --git a/test/data/manifests/rhel_90-aarch64-ami-boot.json b/test/data/manifests/rhel_90-aarch64-ami-boot.json
index 6511b76bc..01a56cf2e 100644
--- a/test/data/manifests/rhel_90-aarch64-ami-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-ami-boot.json
@@ -1005,12 +1005,12 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0",
               "uefi": {
                 "vendor": "redhat",
                 "unified": true
               },
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64",
+              "write_cmdline": false
             }
           },
           {
@@ -8966,7 +8966,6 @@
       "profile-id": "sssd"
     },
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
     },
     "bootloader": "unknown",
diff --git a/test/data/manifests/rhel_90-aarch64-ec2-boot.json b/test/data/manifests/rhel_90-aarch64-ec2-boot.json
index d3040b458..bf46b9304 100644
--- a/test/data/manifests/rhel_90-aarch64-ec2-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-ec2-boot.json
@@ -1020,12 +1020,12 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0",
               "uefi": {
                 "vendor": "redhat",
                 "unified": true
               },
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64",
+              "write_cmdline": false
             }
           },
           {
@@ -9028,7 +9028,6 @@
       "profile-id": "sssd"
     },
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
     },
     "bootloader": "unknown",
diff --git a/test/data/manifests/rhel_90-aarch64-openstack-boot.json b/test/data/manifests/rhel_90-aarch64-openstack-boot.json
index 387a694aa..2f7b90cf9 100644
--- a/test/data/manifests/rhel_90-aarch64-openstack-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-openstack-boot.json
@@ -899,12 +899,12 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "ro net.ifnames=0",
               "uefi": {
                 "vendor": "redhat",
                 "unified": true
               },
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64",
+              "write_cmdline": false
             }
           },
           {
@@ -8973,7 +8973,6 @@
   "image-info": {
     "/etc/resolv.conf": [],
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro net.ifnames=0",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
     },
     "bootloader": "unknown",
diff --git a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json b/test/data/manifests/rhel_90-aarch64-qcow2-boot.json
index 81c745f04..99f4eb66a 100644
--- a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-qcow2-boot.json
@@ -925,12 +925,12 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
               "uefi": {
                 "vendor": "redhat",
                 "unified": true
               },
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64",
+              "write_cmdline": false
             }
           },
           {
@@ -9113,7 +9113,6 @@
   "image-info": {
     "/etc/resolv.conf": [],
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
     },
     "bootloader": "unknown",
diff --git a/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json
index 18fea4210..444c6b3ff 100644
--- a/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json
@@ -344,7 +344,7 @@
             "type": "org.osbuild.kernel-cmdline",
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0"
+              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug"
             }
           },
           {
@@ -1258,12 +1258,12 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
               "uefi": {
                 "vendor": "redhat",
                 "unified": true
               },
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64",
+              "write_cmdline": false
             }
           },
           {
@@ -11477,7 +11477,6 @@
   "image-info": {
     "/etc/resolv.conf": [],
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.aarch64"
     },
     "bootloader": "unknown",
@@ -11488,7 +11487,7 @@
         "grub_users": "$grub_users",
         "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img",
         "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff",
-        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
+        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
         "title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 9.0 (Plow)",
         "version": "0-rescue-ffffffffffffffffffffffffffffffff"
       },
@@ -11498,7 +11497,7 @@
         "grub_users": "$grub_users",
         "initrd": "/initramfs-5.14.0-55.el9.aarch64.img $tuned_initrd",
         "linux": "/vmlinuz-5.14.0-55.el9.aarch64",
-        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 $tuned_params",
+        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug $tuned_params",
         "title": "Red Hat Enterprise Linux (5.14.0-55.el9.aarch64) 9.0 (Plow)",
         "version": "5.14.0-55.el9.aarch64"
       }
diff --git a/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json
index 1b46af7c0..488d1e63b 100644
--- a/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json
+++ b/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json
@@ -982,9 +982,9 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
               "legacy": "powerpc-ieee1275",
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le",
+              "write_cmdline": false
             }
           },
           {
@@ -9909,7 +9909,6 @@
       ]
     },
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le"
     },
     "bootloader": "unknown",
diff --git a/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json
index 8c8499c6d..31337bcf4 100644
--- a/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json
@@ -355,7 +355,7 @@
             "type": "org.osbuild.kernel-cmdline",
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0"
+              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug"
             }
           },
           {
@@ -1323,9 +1323,9 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
               "legacy": "powerpc-ieee1275",
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le",
+              "write_cmdline": false
             }
           },
           {
@@ -12353,7 +12353,6 @@
       ]
     },
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.ppc64le"
     },
     "bootloader": "unknown",
@@ -12364,7 +12363,7 @@
         "grub_users": "$grub_users",
         "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img",
         "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff",
-        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
+        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
         "title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 9.0 (Plow)",
         "version": "0-rescue-ffffffffffffffffffffffffffffffff"
       },
@@ -12374,7 +12373,7 @@
         "grub_users": "$grub_users",
         "initrd": "/initramfs-5.14.0-55.el9.ppc64le.img $tuned_initrd",
         "linux": "/vmlinuz-5.14.0-55.el9.ppc64le",
-        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 $tuned_params",
+        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug $tuned_params",
         "title": "Red Hat Enterprise Linux (5.14.0-55.el9.ppc64le) 9.0 (Plow)",
         "version": "5.14.0-55.el9.ppc64le"
       }
diff --git a/test/data/manifests/rhel_90-s390x-qcow2-boot.json b/test/data/manifests/rhel_90-s390x-qcow2-boot.json
index 786613a22..74eba0fe1 100644
--- a/test/data/manifests/rhel_90-s390x-qcow2-boot.json
+++ b/test/data/manifests/rhel_90-s390x-qcow2-boot.json
@@ -10825,7 +10825,7 @@
         "grub_arg": "--unrestricted",
         "grub_class": "kernel",
         "grub_users": "$grub_users",
-        "id": "-20220219194703-5.14.0-55.el9.s390x",
+        "id": "-20220222232122-5.14.0-55.el9.s390x",
         "initrd": "/boot/initramfs-5.14.0-55.el9.s390x.img",
         "linux": "/boot/vmlinuz-5.14.0-55.el9.s390x",
         "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
diff --git a/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json
index 7ee66a5c5..aa08b7c20 100644
--- a/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json
@@ -458,7 +458,7 @@
             "type": "org.osbuild.kernel-cmdline",
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0"
+              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug"
             }
           },
           {
@@ -13089,10 +13089,10 @@
         "grub_arg": "--unrestricted",
         "grub_class": "kernel",
         "grub_users": "$grub_users",
-        "id": "-20220219194907-0-rescue-ffffffffffffffffffffffffffffffff",
+        "id": "-20220222232346-0-rescue-ffffffffffffffffffffffffffffffff",
         "initrd": "/boot/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img",
         "linux": "/boot/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff",
-        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
+        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
         "title": " (0-rescue-ffffffffffffffffffffffffffffffff)",
         "version": "0-rescue-ffffffffffffffffffffffffffffffff"
       },
@@ -13100,10 +13100,10 @@
         "grub_arg": "--unrestricted",
         "grub_class": "kernel",
         "grub_users": "$grub_users",
-        "id": "-20220219194907-5.14.0-55.el9.s390x",
+        "id": "-20220222232346-5.14.0-55.el9.s390x",
         "initrd": "/boot/initramfs-5.14.0-55.el9.s390x.img",
         "linux": "/boot/vmlinuz-5.14.0-55.el9.s390x",
-        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
+        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
         "title": " (5.14.0-55.el9.s390x)",
         "version": "5.14.0-55.el9.s390x"
       }
diff --git a/test/data/manifests/rhel_90-x86_64-ami-boot.json b/test/data/manifests/rhel_90-x86_64-ami-boot.json
index b4a41fc2c..0c90b9261 100644
--- a/test/data/manifests/rhel_90-x86_64-ami-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-ami-boot.json
@@ -999,9 +999,9 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295",
               "legacy": "i386-pc",
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
+              "write_cmdline": false
             }
           },
           {
@@ -8737,7 +8737,6 @@
       "profile-id": "sssd"
     },
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
     },
     "bootloader": "grub",
diff --git a/test/data/manifests/rhel_90-x86_64-ec2-boot.json b/test/data/manifests/rhel_90-x86_64-ec2-boot.json
index dbd60d635..5ab6c3bbf 100644
--- a/test/data/manifests/rhel_90-x86_64-ec2-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-ec2-boot.json
@@ -1016,9 +1016,9 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295",
               "legacy": "i386-pc",
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
+              "write_cmdline": false
             }
           },
           {
@@ -8801,7 +8801,6 @@
       "profile-id": "sssd"
     },
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
     },
     "bootloader": "grub",
diff --git a/test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json
index fb01393ba..29fe59f37 100644
--- a/test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json
@@ -1214,9 +1214,9 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295",
               "legacy": "i386-pc",
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
+              "write_cmdline": false
             }
           },
           {
@@ -11240,7 +11240,6 @@
       "profile-id": "sssd"
     },
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
     },
     "bootloader": "grub",
diff --git a/test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json
index 5c01863d8..930e3d9a1 100644
--- a/test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json
@@ -1439,9 +1439,9 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 processor.max_cstate=1 intel_idle.max_cstate=1",
               "legacy": "i386-pc",
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
+              "write_cmdline": false
             }
           },
           {
@@ -12521,7 +12521,6 @@
       "profile-id": "sssd"
     },
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 processor.max_cstate=1 intel_idle.max_cstate=1",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
     },
     "bootloader": "grub",
diff --git a/test/data/manifests/rhel_90-x86_64-openstack-boot.json b/test/data/manifests/rhel_90-x86_64-openstack-boot.json
index 6493a0437..0866330ec 100644
--- a/test/data/manifests/rhel_90-x86_64-openstack-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-openstack-boot.json
@@ -933,12 +933,13 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "ro net.ifnames=0",
               "legacy": "i386-pc",
               "uefi": {
-                "vendor": "redhat"
+                "vendor": "redhat",
+                "unified": true
               },
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
+              "write_cmdline": false
             }
           },
           {
@@ -9408,7 +9409,6 @@
   "image-info": {
     "/etc/resolv.conf": [],
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro net.ifnames=0",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
     },
     "bootloader": "grub",
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 00f2c2af4..75e94aa2c 100644
--- a/test/data/manifests/rhel_90-x86_64-qcow2-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-qcow2-boot.json
@@ -945,12 +945,13 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
               "legacy": "i386-pc",
               "uefi": {
-                "vendor": "redhat"
+                "vendor": "redhat",
+                "unified": true
               },
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
+              "write_cmdline": false
             }
           },
           {
@@ -9366,7 +9367,6 @@
   "image-info": {
     "/etc/resolv.conf": [],
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
     },
     "bootloader": "grub",
diff --git a/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json
index 8c7b3865e..0f03f777b 100644
--- a/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json
@@ -358,7 +358,7 @@
             "type": "org.osbuild.kernel-cmdline",
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
-              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0"
+              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug"
             }
           },
           {
@@ -1295,12 +1295,13 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
               "legacy": "i386-pc",
               "uefi": {
-                "vendor": "redhat"
+                "vendor": "redhat",
+                "unified": true
               },
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
+              "write_cmdline": false
             }
           },
           {
@@ -11936,7 +11937,6 @@
   "image-info": {
     "/etc/resolv.conf": [],
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
     },
     "bootloader": "grub",
@@ -11947,7 +11947,7 @@
         "grub_users": "$grub_users",
         "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img",
         "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff",
-        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0",
+        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug",
         "title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 9.0 (Plow)",
         "version": "0-rescue-ffffffffffffffffffffffffffffffff"
       },
@@ -11957,7 +11957,7 @@
         "grub_users": "$grub_users",
         "initrd": "/initramfs-5.14.0-55.el9.x86_64.img $tuned_initrd",
         "linux": "/vmlinuz-5.14.0-55.el9.x86_64",
-        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 $tuned_params",
+        "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug $tuned_params",
         "title": "Red Hat Enterprise Linux (5.14.0-55.el9.x86_64) 9.0 (Plow)",
         "version": "5.14.0-55.el9.x86_64"
       }
diff --git a/test/data/manifests/rhel_90-x86_64-vhd-boot.json b/test/data/manifests/rhel_90-x86_64-vhd-boot.json
index b795c32a1..4ec990d5e 100644
--- a/test/data/manifests/rhel_90-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-vhd-boot.json
@@ -932,12 +932,13 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0",
               "legacy": "i386-pc",
               "uefi": {
-                "vendor": "redhat"
+                "vendor": "redhat",
+                "unified": true
               },
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
+              "write_cmdline": false
             }
           },
           {
@@ -9310,7 +9311,6 @@
   "image-info": {
     "/etc/resolv.conf": [],
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
     },
     "bootloader": "grub",
diff --git a/test/data/manifests/rhel_90-x86_64-vmdk-boot.json b/test/data/manifests/rhel_90-x86_64-vmdk-boot.json
index 02b373997..59f567915 100644
--- a/test/data/manifests/rhel_90-x86_64-vmdk-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-vmdk-boot.json
@@ -905,12 +905,13 @@
             "options": {
               "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
               "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
-              "kernel_opts": "ro net.ifnames=0",
               "legacy": "i386-pc",
               "uefi": {
-                "vendor": "redhat"
+                "vendor": "redhat",
+                "unified": true
               },
-              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
+              "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64",
+              "write_cmdline": false
             }
           },
           {
@@ -9079,7 +9080,6 @@
   "image-info": {
     "/etc/resolv.conf": [],
     "boot-environment": {
-      "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro net.ifnames=0",
       "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-55.el9.x86_64"
     },
     "bootloader": "grub",