Repository: osbuild/osbuild-composer
Pull request #3186 (2022-12-13 14:26:38)

templates/packer: triple aws polling attempts
AMIs can take a long time to get ready.




Patch:
diff --git a/internal/distro/fedora/images.go b/internal/distro/fedora/images.go
index 23e70e92c..ffa2eb132 100644
--- a/internal/distro/fedora/images.go
+++ b/internal/distro/fedora/images.go
@@ -211,12 +211,12 @@ func imageInstallerImage(workload workload.Workload,
 	if strings.HasPrefix(distro.Name(), "fedora") && !common.VersionLessThan(distro.Releasever(), "38") {
 		img.AdditionalAnacondaModules = []string{
 			"org.fedoraproject.Anaconda.Modules.Security",
-			"org.fedoraproject.Anaconda.Modules.Users",
 			"org.fedoraproject.Anaconda.Modules.Timezone",
 			"org.fedoraproject.Anaconda.Modules.Localization",
 		}
 		img.AdditionalKernelOpts = []string{"inst.webui", "inst.webui.remote"}
 	}
+	img.AdditionalAnacondaModules = append(img.AdditionalAnacondaModules, "org.fedoraproject.Anaconda.Modules.Users")
 
 	img.Platform = t.platform
 	img.Workload = workload
@@ -325,6 +325,7 @@ func iotInstallerImage(workload workload.Workload,
 	img.ExtraBasePackages = packageSets[installerPkgsKey]
 	img.Users = users.UsersFromBP(customizations.GetUsers())
 	img.Groups = users.GroupsFromBP(customizations.GetGroups())
+	img.AdditionalAnacondaModules = []string{"org.fedoraproject.Anaconda.Modules.Users"}
 
 	img.SquashfsCompression = "lz4"
 
diff --git a/internal/distro/rhel8/pipelines.go b/internal/distro/rhel8/pipelines.go
index 7293c2b9a..d8a009306 100644
--- a/internal/distro/rhel8/pipelines.go
+++ b/internal/distro/rhel8/pipelines.go
@@ -1064,7 +1064,12 @@ func anacondaTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.PackageSpec
 	}
 
 	p.AddStage(osbuild.NewUsersStage(usersStageOptions))
-	p.AddStage(osbuild.NewAnacondaStage(osbuild.NewAnacondaStageOptions(users, []string{})))
+
+	anacondaModules := []string{}
+	if users {
+		anacondaModules = []string{"org.fedoraproject.Anaconda.Modules.Users"}
+	}
+	p.AddStage(osbuild.NewAnacondaStage(osbuild.NewAnacondaStageOptions(anacondaModules)))
 	p.AddStage(osbuild.NewLoraxScriptStage(loraxScriptStageOptions(arch)))
 	p.AddStage(osbuild.NewDracutStage(dracutStageOptions(kernelVer, arch, []string{
 		"anaconda",
diff --git a/internal/distro/rhel9/images.go b/internal/distro/rhel9/images.go
index b8e136fd5..92ef6c854 100644
--- a/internal/distro/rhel9/images.go
+++ b/internal/distro/rhel9/images.go
@@ -295,6 +295,11 @@ func edgeInstallerImage(workload workload.Workload,
 	img.SquashfsCompression = "xz"
 	img.AdditionalDracutModules = []string{"prefixdevname", "prefixdevname-tools"}
 
+	if len(img.Users)+len(img.Groups) > 0 {
+		// only enable the users module if needed
+		img.AdditionalAnacondaModules = []string{"org.fedoraproject.Anaconda.Modules.Users"}
+	}
+
 	img.ISOLabelTempl = d.isolabelTmpl
 	img.Product = d.product
 	img.Variant = "edge"
@@ -436,6 +441,7 @@ func imageInstallerImage(workload workload.Workload,
 	img.Groups = users.GroupsFromBP(customizations.GetGroups())
 
 	img.AdditionalDracutModules = []string{"prefixdevname", "prefixdevname-tools"}
+	img.AdditionalAnacondaModules = []string{"org.fedoraproject.Anaconda.Modules.Users"}
 
 	img.SquashfsCompression = "xz"
 
diff --git a/internal/image/image_installer.go b/internal/image/image_installer.go
index da7117fbb..463574150 100644
--- a/internal/image/image_installer.go
+++ b/internal/image/image_installer.go
@@ -128,6 +128,9 @@ func (img *ImageInstaller) InstantiateManifest(m *manifest.Manifest,
 	osPipeline.Environment = img.Environment
 	osPipeline.Workload = img.Workload
 
+	// enable ISOLinux on x86_64 only
+	isoLinuxEnabled := img.Platform.GetArch() == platform.ARCH_X86_64
+
 	isoTreePipeline := manifest.NewAnacondaISOTree(m,
 		buildPipeline,
 		anacondaPipeline,
@@ -148,10 +151,11 @@ func (img *ImageInstaller) InstantiateManifest(m *manifest.Manifest,
 
 	isoTreePipeline.OSPipeline = osPipeline
 	isoTreePipeline.KernelOpts = img.AdditionalKernelOpts
+	isoTreePipeline.ISOLinux = isoLinuxEnabled
 
 	isoPipeline := manifest.NewISO(m, buildPipeline, isoTreePipeline, isoLabel)
 	isoPipeline.Filename = img.Filename
-	isoPipeline.ISOLinux = img.Platform.GetArch() == platform.ARCH_X86_64
+	isoPipeline.ISOLinux = isoLinuxEnabled
 
 	artifact := isoPipeline.Export()
 
diff --git a/internal/image/ostree_installer.go b/internal/image/ostree_installer.go
index 6639a0a1c..40164fd8c 100644
--- a/internal/image/ostree_installer.go
+++ b/internal/image/ostree_installer.go
@@ -35,7 +35,8 @@ type OSTreeInstaller struct {
 
 	Filename string
 
-	AdditionalDracutModules []string
+	AdditionalDracutModules   []string
+	AdditionalAnacondaModules []string
 }
 
 func NewOSTreeInstaller(commit ostree.CommitSpec) *OSTreeInstaller {
@@ -67,6 +68,7 @@ func (img *OSTreeInstaller) InstantiateManifest(m *manifest.Manifest,
 	anacondaPipeline.Biosdevname = (img.Platform.GetArch() == platform.ARCH_X86_64)
 	anacondaPipeline.Checkpoint()
 	anacondaPipeline.AdditionalDracutModules = img.AdditionalDracutModules
+	anacondaPipeline.AdditionalAnacondaModules = img.AdditionalAnacondaModules
 
 	rootfsPartitionTable := &disk.PartitionTable{
 		Size: 20 * common.MebiByte,
@@ -95,6 +97,9 @@ func (img *OSTreeInstaller) InstantiateManifest(m *manifest.Manifest,
 	bootTreePipeline.ISOLabel = isoLabel
 	bootTreePipeline.KernelOpts = []string{fmt.Sprintf("inst.stage2=hd:LABEL=%s", isoLabel), fmt.Sprintf("inst.ks=hd:LABEL=%s:%s", isoLabel, kspath)}
 
+	// enable ISOLinux on x86_64 only
+	isoLinuxEnabled := img.Platform.GetArch() == platform.ARCH_X86_64
+
 	isoTreePipeline := manifest.NewAnacondaISOTree(m,
 		buildPipeline,
 		anacondaPipeline,
@@ -114,10 +119,11 @@ func (img *OSTreeInstaller) InstantiateManifest(m *manifest.Manifest,
 	isoTreePipeline.PayloadPath = "/ostree/repo"
 
 	isoTreePipeline.OSTree = &img.Commit
+	isoTreePipeline.ISOLinux = isoLinuxEnabled
 
 	isoPipeline := manifest.NewISO(m, buildPipeline, isoTreePipeline, isoLabel)
 	isoPipeline.Filename = img.Filename
-	isoPipeline.ISOLinux = img.Platform.GetArch() == platform.ARCH_X86_64
+	isoPipeline.ISOLinux = isoLinuxEnabled
 	artifact := isoPipeline.Export()
 
 	return artifact, nil
diff --git a/internal/manifest/anaconda.go b/internal/manifest/anaconda.go
index c555f7bc1..1f2939405 100644
--- a/internal/manifest/anaconda.go
+++ b/internal/manifest/anaconda.go
@@ -197,8 +197,8 @@ func (p *Anaconda) serialize() osbuild.Pipeline {
 	}
 
 	pipeline.AddStage(osbuild.NewUsersStage(usersStageOptions))
-	// always enable users module in anaconda
-	pipeline.AddStage(osbuild.NewAnacondaStage(osbuild.NewAnacondaStageOptions(true, p.AdditionalAnacondaModules)))
+
+	pipeline.AddStage(osbuild.NewAnacondaStage(osbuild.NewAnacondaStageOptions(p.AdditionalAnacondaModules)))
 	pipeline.AddStage(osbuild.NewLoraxScriptStage(&osbuild.LoraxScriptStageOptions{
 		Path:     "99-generic/runtime-postinstall.tmpl",
 		BaseArch: p.platform.GetArch().String(),
diff --git a/internal/manifest/iso_tree.go b/internal/manifest/iso_tree.go
index 47557e0eb..0f327ed1d 100644
--- a/internal/manifest/iso_tree.go
+++ b/internal/manifest/iso_tree.go
@@ -46,6 +46,9 @@ type AnacondaISOTree struct {
 	OSTree     *ostree.CommitSpec
 
 	KernelOpts []string
+
+	// Enable ISOLinux stage
+	ISOLinux bool
 }
 
 func NewAnacondaISOTree(m *Manifest,
@@ -169,18 +172,21 @@ func (p *AnacondaISOTree) serialize() osbuild.Pipeline {
 	squashfsStage := osbuild.NewSquashfsStage(&squashfsOptions, p.rootfsPipeline.Name())
 	pipeline.AddStage(squashfsStage)
 
-	isoLinuxOptions := &osbuild.ISOLinuxStageOptions{
-		Product: osbuild.ISOLinuxProduct{
-			Name:    p.anacondaPipeline.product,
-			Version: p.anacondaPipeline.version,
-		},
-		Kernel: osbuild.ISOLinuxKernel{
-			Dir:  "/images/pxeboot",
-			Opts: kernelOpts,
-		},
+	if p.ISOLinux {
+		isoLinuxOptions := &osbuild.ISOLinuxStageOptions{
+			Product: osbuild.ISOLinuxProduct{
+				Name:    p.anacondaPipeline.product,
+				Version: p.anacondaPipeline.version,
+			},
+			Kernel: osbuild.ISOLinuxKernel{
+				Dir:  "/images/pxeboot",
+				Opts: kernelOpts,
+			},
+		}
+
+		isoLinuxStage := osbuild.NewISOLinuxStage(isoLinuxOptions, p.anacondaPipeline.Name())
+		pipeline.AddStage(isoLinuxStage)
 	}
-	isoLinuxStage := osbuild.NewISOLinuxStage(isoLinuxOptions, p.anacondaPipeline.Name())
-	pipeline.AddStage(isoLinuxStage)
 
 	filename := "images/efiboot.img"
 	pipeline.AddStage(osbuild.NewTruncateStage(&osbuild.TruncateStageOptions{
diff --git a/internal/osbuild/anaconda_stage.go b/internal/osbuild/anaconda_stage.go
index 971bdbac0..b8d1d1e8a 100644
--- a/internal/osbuild/anaconda_stage.go
+++ b/internal/osbuild/anaconda_stage.go
@@ -15,17 +15,13 @@ func NewAnacondaStage(options *AnacondaStageOptions) *Stage {
 	}
 }
 
-func NewAnacondaStageOptions(users bool, additionalModules []string) *AnacondaStageOptions {
+func NewAnacondaStageOptions(additionalModules []string) *AnacondaStageOptions {
 	modules := []string{
 		"org.fedoraproject.Anaconda.Modules.Network",
 		"org.fedoraproject.Anaconda.Modules.Payloads",
 		"org.fedoraproject.Anaconda.Modules.Storage",
 	}
 
-	if users {
-		modules = append(modules, "org.fedoraproject.Anaconda.Modules.Users")
-	}
-
 	if len(additionalModules) > 0 {
 		modules = append(modules, additionalModules...)
 	}
diff --git a/osbuild-composer.spec b/osbuild-composer.spec
index 60103d426..b76abf0a2 100644
--- a/osbuild-composer.spec
+++ b/osbuild-composer.spec
@@ -9,7 +9,7 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        70
+Version:        71
 
 %gometa
 
diff --git a/templates/packer/worker.pkr.hcl b/templates/packer/worker.pkr.hcl
index 77f34ec35..5f3c4e61d 100644
--- a/templates/packer/worker.pkr.hcl
+++ b/templates/packer/worker.pkr.hcl
@@ -34,7 +34,7 @@ build {
     instance_type = "c6a.large"
     aws_polling {
       delay_seconds = 20
-      max_attempts  = 60
+      max_attempts  = 180
     }
 
     # Set a name for the resulting AMI.
@@ -68,7 +68,7 @@ build {
     instance_type = "c6g.large"
     aws_polling {
       delay_seconds = 20
-      max_attempts  = 60
+      max_attempts  = 180
     }
 
     # Set a name for the resulting AMI.


Test patch:
diff --git a/test/data/manifests/centos_9-aarch64-edge_installer-boot.json b/test/data/manifests/centos_9-aarch64-edge_installer-boot.json
index 8b81a54f7..04892213b 100644
--- a/test/data/manifests/centos_9-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/centos_9-aarch64-edge_installer-boot.json
@@ -9339,8 +9339,7 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage",
-                "org.fedoraproject.Anaconda.Modules.Users"
+                "org.fedoraproject.Anaconda.Modules.Storage"
               ]
             }
           },
@@ -9587,31 +9586,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "CentOS Stream",
-                "version": "9-stream"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=CentOS-Stream-9-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=CentOS-Stream-9-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json
index 1c94ee4d1..e0a4d1710 100644
--- a/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json
@@ -9616,31 +9616,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "CentOS Stream",
-                "version": "9-stream"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=CentOS-Stream-9-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=CentOS-Stream-9-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/centos_9-aarch64-image_installer-boot.json b/test/data/manifests/centos_9-aarch64-image_installer-boot.json
index 519af8e6d..75db68b14 100644
--- a/test/data/manifests/centos_9-aarch64-image_installer-boot.json
+++ b/test/data/manifests/centos_9-aarch64-image_installer-boot.json
@@ -13167,31 +13167,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "CentOS Stream",
-                "version": "9-stream"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=CentOS-Stream-9-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=CentOS-Stream-9-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/centos_9-aarch64-image_installer_with_users-boot.json b/test/data/manifests/centos_9-aarch64-image_installer_with_users-boot.json
index eba3ac384..41b21bc17 100644
--- a/test/data/manifests/centos_9-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/centos_9-aarch64-image_installer_with_users-boot.json
@@ -13354,31 +13354,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "CentOS Stream",
-                "version": "9-stream"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=CentOS-Stream-9-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=CentOS-Stream-9-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/centos_9-x86_64-edge_installer-boot.json b/test/data/manifests/centos_9-x86_64-edge_installer-boot.json
index 651444ec1..3be2095a5 100644
--- a/test/data/manifests/centos_9-x86_64-edge_installer-boot.json
+++ b/test/data/manifests/centos_9-x86_64-edge_installer-boot.json
@@ -9499,8 +9499,7 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage",
-                "org.fedoraproject.Anaconda.Modules.Users"
+                "org.fedoraproject.Anaconda.Modules.Storage"
               ]
             }
           },
diff --git a/test/data/manifests/fedora_35-aarch64-image_installer-boot.json b/test/data/manifests/fedora_35-aarch64-image_installer-boot.json
index 995df42e8..92d81d30c 100644
--- a/test/data/manifests/fedora_35-aarch64-image_installer-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-image_installer-boot.json
@@ -12815,30 +12815,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "35"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-35-BaseOS-aarch64"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_35-aarch64-image_installer_with_users-boot.json b/test/data/manifests/fedora_35-aarch64-image_installer_with_users-boot.json
index cdb50fb47..1a855c9f9 100644
--- a/test/data/manifests/fedora_35-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-image_installer_with_users-boot.json
@@ -12968,30 +12968,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "35"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-35-BaseOS-aarch64"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_35-aarch64-iot_installer-boot.json b/test/data/manifests/fedora_35-aarch64-iot_installer-boot.json
index 9c01a3276..56690451d 100644
--- a/test/data/manifests/fedora_35-aarch64-iot_installer-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-iot_installer-boot.json
@@ -10151,31 +10151,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "35"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-35-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=Fedora-35-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_35-aarch64-iot_installer_with_users-boot.json b/test/data/manifests/fedora_35-aarch64-iot_installer_with_users-boot.json
index eef38d6c7..bdf3c9297 100644
--- a/test/data/manifests/fedora_35-aarch64-iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-iot_installer_with_users-boot.json
@@ -10180,31 +10180,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "35"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-35-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=Fedora-35-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_36-aarch64-image_installer-boot.json b/test/data/manifests/fedora_36-aarch64-image_installer-boot.json
index 6a1eaaba5..8cac18028 100644
--- a/test/data/manifests/fedora_36-aarch64-image_installer-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-image_installer-boot.json
@@ -13471,30 +13471,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "36"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-36-BaseOS-aarch64"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_36-aarch64-image_installer_with_users-boot.json b/test/data/manifests/fedora_36-aarch64-image_installer_with_users-boot.json
index 02e862c42..9cad3e65f 100644
--- a/test/data/manifests/fedora_36-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-image_installer_with_users-boot.json
@@ -13632,30 +13632,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "36"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-36-BaseOS-aarch64"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_36-aarch64-iot_installer-boot.json b/test/data/manifests/fedora_36-aarch64-iot_installer-boot.json
index 92c72c27e..9d74d19d9 100644
--- a/test/data/manifests/fedora_36-aarch64-iot_installer-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-iot_installer-boot.json
@@ -10672,31 +10672,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "36"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-36-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=Fedora-36-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_36-aarch64-iot_installer_with_users-boot.json b/test/data/manifests/fedora_36-aarch64-iot_installer_with_users-boot.json
index 901671d2a..9729c88e0 100644
--- a/test/data/manifests/fedora_36-aarch64-iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-iot_installer_with_users-boot.json
@@ -10701,31 +10701,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "36"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-36-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=Fedora-36-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_37-aarch64-image_installer-boot.json b/test/data/manifests/fedora_37-aarch64-image_installer-boot.json
index fd5dbbf3b..74bc4a082 100644
--- a/test/data/manifests/fedora_37-aarch64-image_installer-boot.json
+++ b/test/data/manifests/fedora_37-aarch64-image_installer-boot.json
@@ -13643,30 +13643,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "37"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-37-BaseOS-aarch64"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_37-aarch64-image_installer_with_users-boot.json b/test/data/manifests/fedora_37-aarch64-image_installer_with_users-boot.json
index b25869719..ee9993a2d 100644
--- a/test/data/manifests/fedora_37-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_37-aarch64-image_installer_with_users-boot.json
@@ -13820,30 +13820,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "37"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-37-BaseOS-aarch64"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_37-aarch64-iot_installer-boot.json b/test/data/manifests/fedora_37-aarch64-iot_installer-boot.json
index e8cdd1ef2..5f622491b 100644
--- a/test/data/manifests/fedora_37-aarch64-iot_installer-boot.json
+++ b/test/data/manifests/fedora_37-aarch64-iot_installer-boot.json
@@ -10798,31 +10798,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "37"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-37-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=Fedora-37-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_37-aarch64-iot_installer_with_users-boot.json b/test/data/manifests/fedora_37-aarch64-iot_installer_with_users-boot.json
index 977f21e16..04f538b7e 100644
--- a/test/data/manifests/fedora_37-aarch64-iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_37-aarch64-iot_installer_with_users-boot.json
@@ -10827,31 +10827,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "37"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-37-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=Fedora-37-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_38-aarch64-image_installer-boot.json b/test/data/manifests/fedora_38-aarch64-image_installer-boot.json
index f83fec6cb..91036eaa1 100644
--- a/test/data/manifests/fedora_38-aarch64-image_installer-boot.json
+++ b/test/data/manifests/fedora_38-aarch64-image_installer-boot.json
@@ -10126,11 +10126,10 @@
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
                 "org.fedoraproject.Anaconda.Modules.Storage",
-                "org.fedoraproject.Anaconda.Modules.Users",
                 "org.fedoraproject.Anaconda.Modules.Security",
-                "org.fedoraproject.Anaconda.Modules.Users",
                 "org.fedoraproject.Anaconda.Modules.Timezone",
-                "org.fedoraproject.Anaconda.Modules.Localization"
+                "org.fedoraproject.Anaconda.Modules.Localization",
+                "org.fedoraproject.Anaconda.Modules.Users"
               ]
             }
           },
@@ -13521,32 +13520,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "38"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-38-BaseOS-aarch64",
-                  "inst.webui",
-                  "inst.webui.remote"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_38-aarch64-image_installer_with_users-boot.json b/test/data/manifests/fedora_38-aarch64-image_installer_with_users-boot.json
index 3f20614a6..8d47d5751 100644
--- a/test/data/manifests/fedora_38-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_38-aarch64-image_installer_with_users-boot.json
@@ -10161,11 +10161,10 @@
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
                 "org.fedoraproject.Anaconda.Modules.Storage",
-                "org.fedoraproject.Anaconda.Modules.Users",
                 "org.fedoraproject.Anaconda.Modules.Security",
-                "org.fedoraproject.Anaconda.Modules.Users",
                 "org.fedoraproject.Anaconda.Modules.Timezone",
-                "org.fedoraproject.Anaconda.Modules.Localization"
+                "org.fedoraproject.Anaconda.Modules.Localization",
+                "org.fedoraproject.Anaconda.Modules.Users"
               ]
             }
           },
@@ -13690,32 +13689,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "38"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-38-BaseOS-aarch64",
-                  "inst.webui",
-                  "inst.webui.remote"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_38-aarch64-iot_installer-boot.json b/test/data/manifests/fedora_38-aarch64-iot_installer-boot.json
index 57326ac45..6b402027d 100644
--- a/test/data/manifests/fedora_38-aarch64-iot_installer-boot.json
+++ b/test/data/manifests/fedora_38-aarch64-iot_installer-boot.json
@@ -10437,31 +10437,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "38"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-38-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=Fedora-38-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_38-aarch64-iot_installer_with_users-boot.json b/test/data/manifests/fedora_38-aarch64-iot_installer_with_users-boot.json
index 9bfe2b9d0..b0541a039 100644
--- a/test/data/manifests/fedora_38-aarch64-iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_38-aarch64-iot_installer_with_users-boot.json
@@ -10466,31 +10466,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Fedora",
-                "version": "38"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=Fedora-38-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=Fedora-38-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/fedora_38-x86_64-image_installer-boot.json b/test/data/manifests/fedora_38-x86_64-image_installer-boot.json
index 6168bf5b6..b779f9fdb 100644
--- a/test/data/manifests/fedora_38-x86_64-image_installer-boot.json
+++ b/test/data/manifests/fedora_38-x86_64-image_installer-boot.json
@@ -10310,11 +10310,10 @@
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
                 "org.fedoraproject.Anaconda.Modules.Storage",
-                "org.fedoraproject.Anaconda.Modules.Users",
                 "org.fedoraproject.Anaconda.Modules.Security",
-                "org.fedoraproject.Anaconda.Modules.Users",
                 "org.fedoraproject.Anaconda.Modules.Timezone",
-                "org.fedoraproject.Anaconda.Modules.Localization"
+                "org.fedoraproject.Anaconda.Modules.Localization",
+                "org.fedoraproject.Anaconda.Modules.Users"
               ]
             }
           },
diff --git a/test/data/manifests/fedora_38-x86_64-image_installer_with_users-boot.json b/test/data/manifests/fedora_38-x86_64-image_installer_with_users-boot.json
index 690f35835..717ab4254 100644
--- a/test/data/manifests/fedora_38-x86_64-image_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_38-x86_64-image_installer_with_users-boot.json
@@ -10345,11 +10345,10 @@
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
                 "org.fedoraproject.Anaconda.Modules.Storage",
-                "org.fedoraproject.Anaconda.Modules.Users",
                 "org.fedoraproject.Anaconda.Modules.Security",
-                "org.fedoraproject.Anaconda.Modules.Users",
                 "org.fedoraproject.Anaconda.Modules.Timezone",
-                "org.fedoraproject.Anaconda.Modules.Localization"
+                "org.fedoraproject.Anaconda.Modules.Localization",
+                "org.fedoraproject.Anaconda.Modules.Users"
               ]
             }
           },
diff --git a/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json
index f5c3135af..e3e8f0949 100644
--- a/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json
@@ -3474,8 +3474,7 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage",
-                "org.fedoraproject.Anaconda.Modules.Users"
+                "org.fedoraproject.Anaconda.Modules.Storage"
               ]
             }
           },
@@ -3722,31 +3721,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.0"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-0-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-0-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json
index 2264cf904..9e9bb78f4 100644
--- a/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json
@@ -3751,31 +3751,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.0"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-0-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-0-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_90-aarch64-image_installer-boot.json b/test/data/manifests/rhel_90-aarch64-image_installer-boot.json
index cecca38c2..828e14ef5 100644
--- a/test/data/manifests/rhel_90-aarch64-image_installer-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-image_installer-boot.json
@@ -5187,31 +5187,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.0"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-0-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-0-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_90-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_90-aarch64-image_installer_with_users-boot.json
index 5436c24a0..e58b746cf 100644
--- a/test/data/manifests/rhel_90-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-image_installer_with_users-boot.json
@@ -5282,31 +5282,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.0"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-0-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-0-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_90-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_90-x86_64-edge_installer-boot.json
index 3b5ddad0b..1608a4e82 100644
--- a/test/data/manifests/rhel_90-x86_64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-edge_installer-boot.json
@@ -3537,8 +3537,7 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage",
-                "org.fedoraproject.Anaconda.Modules.Users"
+                "org.fedoraproject.Anaconda.Modules.Storage"
               ]
             }
           },
diff --git a/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json
index b446d5567..514b58ebc 100644
--- a/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json
@@ -9451,8 +9451,7 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage",
-                "org.fedoraproject.Anaconda.Modules.Users"
+                "org.fedoraproject.Anaconda.Modules.Storage"
               ]
             }
           },
@@ -9699,31 +9698,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.1"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-1-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-1-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json
index 78393cdf0..f4d6e5e00 100644
--- a/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json
@@ -9728,31 +9728,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.1"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-1-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-1-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_91-aarch64-image_installer-boot.json b/test/data/manifests/rhel_91-aarch64-image_installer-boot.json
index 31cbb4591..9fbc69a18 100644
--- a/test/data/manifests/rhel_91-aarch64-image_installer-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-image_installer-boot.json
@@ -13383,31 +13383,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.1"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-1-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-1-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_91-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_91-aarch64-image_installer_with_users-boot.json
index 83d580a22..4526b1959 100644
--- a/test/data/manifests/rhel_91-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-image_installer_with_users-boot.json
@@ -13570,31 +13570,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.1"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-1-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-1-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_91-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_91-x86_64-edge_installer-boot.json
index 03b727035..a1f5d2873 100644
--- a/test/data/manifests/rhel_91-x86_64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-edge_installer-boot.json
@@ -9595,8 +9595,7 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage",
-                "org.fedoraproject.Anaconda.Modules.Users"
+                "org.fedoraproject.Anaconda.Modules.Storage"
               ]
             }
           },
diff --git a/test/data/manifests/rhel_92-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_92-aarch64-edge_installer-boot.json
index fa38ebc41..f3cf274c0 100644
--- a/test/data/manifests/rhel_92-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-edge_installer-boot.json
@@ -9467,8 +9467,7 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage",
-                "org.fedoraproject.Anaconda.Modules.Users"
+                "org.fedoraproject.Anaconda.Modules.Storage"
               ]
             }
           },
@@ -9715,31 +9714,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.2"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-2-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-2-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_92-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_92-aarch64-edge_installer_with_users-boot.json
index ab3c99b84..229c3bc90 100644
--- a/test/data/manifests/rhel_92-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-edge_installer_with_users-boot.json
@@ -9744,31 +9744,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.2"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-2-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-2-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_92-aarch64-image_installer-boot.json b/test/data/manifests/rhel_92-aarch64-image_installer-boot.json
index c346272b8..2650dcf0d 100644
--- a/test/data/manifests/rhel_92-aarch64-image_installer-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-image_installer-boot.json
@@ -13407,31 +13407,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.2"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-2-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-2-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_92-aarch64-image_installer_with_users-boot.json b/test/data/manifests/rhel_92-aarch64-image_installer_with_users-boot.json
index eff42dc68..5675e4263 100644
--- a/test/data/manifests/rhel_92-aarch64-image_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-image_installer_with_users-boot.json
@@ -13594,31 +13594,6 @@
               }
             }
           },
-          {
-            "type": "org.osbuild.isolinux",
-            "inputs": {
-              "data": {
-                "type": "org.osbuild.tree",
-                "origin": "org.osbuild.pipeline",
-                "references": [
-                  "name:anaconda-tree"
-                ]
-              }
-            },
-            "options": {
-              "product": {
-                "name": "Red Hat Enterprise Linux",
-                "version": "9.2"
-              },
-              "kernel": {
-                "dir": "/images/pxeboot",
-                "opts": [
-                  "inst.stage2=hd:LABEL=RHEL-9-2-0-BaseOS-aarch64",
-                  "inst.ks=hd:LABEL=RHEL-9-2-0-BaseOS-aarch64:/osbuild.ks"
-                ]
-              }
-            }
-          },
           {
             "type": "org.osbuild.truncate",
             "options": {
diff --git a/test/data/manifests/rhel_92-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_92-x86_64-edge_installer-boot.json
index c17fa7e5c..4be4cc928 100644
--- a/test/data/manifests/rhel_92-x86_64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-edge_installer-boot.json
@@ -9611,8 +9611,7 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage",
-                "org.fedoraproject.Anaconda.Modules.Users"
+                "org.fedoraproject.Anaconda.Modules.Storage"
               ]
             }
           },