diff --git a/internal/distro/rhel86/package_sets.go b/internal/distro/rhel86/package_sets.go
index 3bf6fb570..61e7edfb4 100644
--- a/internal/distro/rhel86/package_sets.go
+++ b/internal/distro/rhel86/package_sets.go
@@ -450,11 +450,25 @@ func edgeCommitPackageSet(t *imageType) rpmmd.PackageSet {
 			"bash-completion", "tmux", "ima-evm-utils", "audit", "podman",
 			"container-selinux", "skopeo", "criu", "slirp4netns",
 			"fuse-overlayfs", "clevis", "clevis-dracut", "clevis-luks",
-			"greenboot", "greenboot-default-health-checks",
+			"greenboot",
 		},
 		Exclude: []string{"rng-tools"},
 	}
 
+	var greenbootExtras rpmmd.PackageSet
+	if t.arch.distro.isRHEL() {
+		greenbootExtras.Include = []string{"greenboot-default-health-checks"}
+	} else {
+		greenbootExtras.Include = []string{
+			"greenboot-grub2",
+			"greenboot-reboot",
+			"greenboot-rpm-ostree-grub2",
+			"greenboot-status",
+		}
+	}
+
+	ps = ps.Append(greenbootExtras)
+
 	ps = ps.Append(bootPackageSet(t))
 
 	switch t.arch.Name() {