diff --git a/internal/distro/fedora/package_sets.go b/internal/distro/fedora/package_sets.go
index 95df98bdb..114ff978c 100644
--- a/internal/distro/fedora/package_sets.go
+++ b/internal/distro/fedora/package_sets.go
@@ -15,41 +15,12 @@ import (
 
 // distro-wide build package set
 func distroBuildPackageSet(t *imageType) rpmmd.PackageSet {
-	ps := rpmmd.PackageSet{
-		Include: []string{
-			"dnf",
-			"dosfstools",
-			"e2fsprogs",
-			"policycoreutils",
-			"qemu-img",
-			"selinux-policy-targeted",
-			"systemd",
-			"tar",
-			"xz",
-		},
-	}
-
-	switch t.Arch().Name() {
-
-	case distro.X86_64ArchName:
-		ps = ps.Append(x8664BuildPackageSet(t))
-	}
-
-	return ps
-}
-
-// x86_64 build package set
-func x8664BuildPackageSet(t *imageType) rpmmd.PackageSet {
-	return rpmmd.PackageSet{
-		Include: []string{
-			"grub2-pc",
-		},
-	}
+	return rpmmd.PackageSet{}
 }
 
 // common ec2 image build package set
 func ec2BuildPackageSet(t *imageType) rpmmd.PackageSet {
-	return distroBuildPackageSet(t)
+	return rpmmd.PackageSet{}
 }
 
 func ec2CommonPackageSet(t *imageType) rpmmd.PackageSet {
@@ -76,12 +47,11 @@ func ec2CommonPackageSet(t *imageType) rpmmd.PackageSet {
 
 // common iot image build package set
 func iotBuildPackageSet(t *imageType) rpmmd.PackageSet {
-	return distroBuildPackageSet(t).Append(
-		rpmmd.PackageSet{
-			Include: []string{
-				"rpm-ostree",
-			},
-		})
+	return rpmmd.PackageSet{
+		Include: []string{
+			"rpm-ostree",
+		},
+	}
 }
 
 // installer boot package sets, needed for booting and
@@ -138,13 +108,12 @@ func anacondaBootPackageSet(t *imageType) rpmmd.PackageSet {
 }
 
 func installerBuildPackageSet(t *imageType) rpmmd.PackageSet {
-	return distroBuildPackageSet(t).Append(
-		rpmmd.PackageSet{
-			Include: []string{
-				"isomd5sum",
-				"xorriso",
-			},
-		})
+	return rpmmd.PackageSet{
+		Include: []string{
+			"isomd5sum",
+			"xorriso",
+		},
+	}
 }
 
 func anacondaBuildPackageSet(t *imageType) rpmmd.PackageSet {
diff --git a/internal/manifest/build.go b/internal/manifest/build.go
index 2e405e68b..ed9386f7e 100644
--- a/internal/manifest/build.go
+++ b/internal/manifest/build.go
@@ -40,7 +40,18 @@ func (p *BuildPipeline) addDependent(dep Pipeline) {
 }
 
 func (p *BuildPipeline) getPackageSetChain() []rpmmd.PackageSet {
-	packages := []string{}
+	// TODO: break apart into individual pipelines
+	packages := []string{
+		"dnf",
+		"dosfstools",
+		"e2fsprogs",
+		"policycoreutils",
+		"qemu-img",
+		"selinux-policy-targeted",
+		"systemd",
+		"tar",
+		"xz",
+	}
 
 	for _, pipeline := range p.dependents {
 		packages = append(packages, pipeline.getBuildPackages()...)
diff --git a/internal/manifest/os.go b/internal/manifest/os.go
index c48ee75c4..2f36b08b4 100644
--- a/internal/manifest/os.go
+++ b/internal/manifest/os.go
@@ -156,6 +156,14 @@ func (p *OSPipeline) getPackageSetChain() []rpmmd.PackageSet {
 	return chain
 }
 
+func (p *OSPipeline) getBuildPackages() []string {
+	packages := []string{}
+	if p.grubLegacy != "" {
+		packages = append(packages, "grub2-pc")
+	}
+	return packages
+}
+
 func (p *OSPipeline) getOSTreeCommits() []osTreeCommit {
 	commits := []osTreeCommit{}
 	if p.osTreeParent != "" && p.osTreeURL != "" {