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..618473132 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(false, 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..1430d5202 100644
--- a/internal/distro/rhel9/images.go
+++ b/internal/distro/rhel9/images.go
@@ -294,6 +294,7 @@ func edgeInstallerImage(workload workload.Workload,
 
 	img.SquashfsCompression = "xz"
 	img.AdditionalDracutModules = []string{"prefixdevname", "prefixdevname-tools"}
+	img.AdditionalAnacondaModules = []string{"org.fedoraproject.Anaconda.Modules.Users"}
 
 	img.ISOLabelTempl = d.isolabelTmpl
 	img.Product = d.product
@@ -436,6 +437,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/ostree_installer.go b/internal/image/ostree_installer.go
index fac5aeeaa..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,
diff --git a/internal/manifest/anaconda.go b/internal/manifest/anaconda.go
index c555f7bc1..7dba37033 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(false, p.AdditionalAnacondaModules)))
 	pipeline.AddStage(osbuild.NewLoraxScriptStage(&osbuild.LoraxScriptStageOptions{
 		Path:     "99-generic/runtime-postinstall.tmpl",
 		BaseArch: p.platform.GetArch().String(),