diff --git a/internal/distro/rhel86/pipelines.go b/internal/distro/rhel86/pipelines.go
index 463c6236f78..bf346a1d1ed 100644
--- a/internal/distro/rhel86/pipelines.go
+++ b/internal/distro/rhel86/pipelines.go
@@ -257,8 +257,7 @@ func imageInstallerPipelines(t *imageType, customizations *blueprint.Customizati
 	}
 	archName := t.arch.name
 	d := t.arch.distro
-	ksUsers := len(customizations.GetUsers())+len(customizations.GetGroups()) > 0
-	pipelines = append(pipelines, *anacondaTreePipeline(repos, installerPackages, kernelVer, archName, d.product, d.osVersion, "BaseOS", ksUsers))
+	pipelines = append(pipelines, *anacondaTreePipeline(repos, installerPackages, kernelVer, archName, d.product, d.osVersion, "BaseOS", true))
 	isolabel := fmt.Sprintf(d.isolabelTmpl, archName)
 	pipelines = append(pipelines, *bootISOTreePipeline(kernelVer, archName, d.vendor, d.product, d.osVersion, isolabel, kickstartOptions, tarPayloadStages))
 	pipelines = append(pipelines, *bootISOPipeline(t.Filename(), d.isolabelTmpl, t.Arch().Name(), t.Arch().Name() == "x86_64"))
diff --git a/internal/distro/rhel90/pipelines.go b/internal/distro/rhel90/pipelines.go
index 04b0d148ade..7940c3d1739 100644
--- a/internal/distro/rhel90/pipelines.go
+++ b/internal/distro/rhel90/pipelines.go
@@ -249,8 +249,7 @@ func imageInstallerPipelines(t *imageType, customizations *blueprint.Customizati
 	}
 	archName := t.arch.name
 	d := t.arch.distro
-	ksUsers := len(customizations.GetUsers())+len(customizations.GetGroups()) > 0
-	pipelines = append(pipelines, *anacondaTreePipeline(repos, installerPackages, kernelVer, archName, d.product, d.osVersion, "BaseOS", ksUsers))
+	pipelines = append(pipelines, *anacondaTreePipeline(repos, installerPackages, kernelVer, archName, d.product, d.osVersion, "BaseOS", true))
 	isolabel := fmt.Sprintf(d.isolabelTmpl, archName)
 	pipelines = append(pipelines, *bootISOTreePipeline(kernelVer, archName, d.vendor, d.product, d.osVersion, isolabel, kickstartOptions, tarPayloadStages))
 	pipelines = append(pipelines, *bootISOPipeline(t.Filename(), d.isolabelTmpl, t.Arch().Name(), t.Arch().Name() == "x86_64"))
diff --git a/test/data/manifests/centos_8-aarch64-image_installer-boot.json b/test/data/manifests/centos_8-aarch64-image_installer-boot.json
index 1fb0b5b5679..9dba3b30281 100644
--- a/test/data/manifests/centos_8-aarch64-image_installer-boot.json
+++ b/test/data/manifests/centos_8-aarch64-image_installer-boot.json
@@ -1891,7 +1891,8 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage"
+                "org.fedoraproject.Anaconda.Modules.Storage",
+                "org.fedoraproject.Anaconda.Modules.Users"
               ]
             }
           },
diff --git a/test/data/manifests/centos_8-x86_64-image_installer-boot.json b/test/data/manifests/centos_8-x86_64-image_installer-boot.json
index f7bbd1e21f6..a02f0d6121a 100644
--- a/test/data/manifests/centos_8-x86_64-image_installer-boot.json
+++ b/test/data/manifests/centos_8-x86_64-image_installer-boot.json
@@ -1920,7 +1920,8 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage"
+                "org.fedoraproject.Anaconda.Modules.Storage",
+                "org.fedoraproject.Anaconda.Modules.Users"
               ]
             }
           },
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 fd425e542d7..d0a7ef9f2c5 100644
--- a/test/data/manifests/centos_9-aarch64-image_installer-boot.json
+++ b/test/data/manifests/centos_9-aarch64-image_installer-boot.json
@@ -1849,7 +1849,8 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage"
+                "org.fedoraproject.Anaconda.Modules.Storage",
+                "org.fedoraproject.Anaconda.Modules.Users"
               ]
             }
           },
diff --git a/test/data/manifests/centos_9-x86_64-image_installer-boot.json b/test/data/manifests/centos_9-x86_64-image_installer-boot.json
index e45038d47ae..0db2f37b8cd 100644
--- a/test/data/manifests/centos_9-x86_64-image_installer-boot.json
+++ b/test/data/manifests/centos_9-x86_64-image_installer-boot.json
@@ -1885,7 +1885,8 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage"
+                "org.fedoraproject.Anaconda.Modules.Storage",
+                "org.fedoraproject.Anaconda.Modules.Users"
               ]
             }
           },
diff --git a/test/data/manifests/rhel_86-aarch64-image_installer-boot.json b/test/data/manifests/rhel_86-aarch64-image_installer-boot.json
index c32d07f8eb5..8321859e7a4 100644
--- a/test/data/manifests/rhel_86-aarch64-image_installer-boot.json
+++ b/test/data/manifests/rhel_86-aarch64-image_installer-boot.json
@@ -1924,7 +1924,8 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage"
+                "org.fedoraproject.Anaconda.Modules.Storage",
+                "org.fedoraproject.Anaconda.Modules.Users"
               ]
             }
           },
diff --git a/test/data/manifests/rhel_86-x86_64-image_installer-boot.json b/test/data/manifests/rhel_86-x86_64-image_installer-boot.json
index 8b01156e61d..3182b05b1f6 100644
--- a/test/data/manifests/rhel_86-x86_64-image_installer-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-image_installer-boot.json
@@ -1956,7 +1956,8 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage"
+                "org.fedoraproject.Anaconda.Modules.Storage",
+                "org.fedoraproject.Anaconda.Modules.Users"
               ]
             }
           },
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 5b6f61dcab7..b85f8ee9d0f 100644
--- a/test/data/manifests/rhel_90-aarch64-image_installer-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-image_installer-boot.json
@@ -1872,7 +1872,8 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage"
+                "org.fedoraproject.Anaconda.Modules.Storage",
+                "org.fedoraproject.Anaconda.Modules.Users"
               ]
             }
           },
diff --git a/test/data/manifests/rhel_90-x86_64-image_installer-boot.json b/test/data/manifests/rhel_90-x86_64-image_installer-boot.json
index 6d2ea780a6f..bf33b977331 100644
--- a/test/data/manifests/rhel_90-x86_64-image_installer-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-image_installer-boot.json
@@ -1902,7 +1902,8 @@
               "kickstart-modules": [
                 "org.fedoraproject.Anaconda.Modules.Network",
                 "org.fedoraproject.Anaconda.Modules.Payloads",
-                "org.fedoraproject.Anaconda.Modules.Storage"
+                "org.fedoraproject.Anaconda.Modules.Storage",
+                "org.fedoraproject.Anaconda.Modules.Users"
               ]
             }
           },