diff --git a/internal/distro/rhel90/package_sets.go b/internal/distro/rhel90/package_sets.go
index 15093c456..42e86bc76 100644
--- a/internal/distro/rhel90/package_sets.go
+++ b/internal/distro/rhel90/package_sets.go
@@ -267,15 +267,13 @@ func qcow2CommonPackageSet(t *imageType) rpmmd.PackageSet {
 			"aic94xx-firmware", "alsa-firmware", "alsa-lib",
 			"alsa-tools-firmware", "biosdevname", "dnf-plugin-spacewalk",
 			"dracut-config-rescue", "fedora-release", "fedora-repos",
-			"firewalld", "iprutils", "ivtv-firmware",
-			"iwl100-firmware", "iwl1000-firmware", "iwl105-firmware",
-			"iwl135-firmware", "iwl2000-firmware", "iwl2030-firmware",
-			"iwl3160-firmware", "iwl3945-firmware", "iwl4965-firmware",
-			"iwl5000-firmware", "iwl5150-firmware",
-			"iwl6000g2a-firmware", "iwl6000g2b-firmware", "iwl6050-firmware",
-			"iwl7260-firmware", "langpacks-*", "langpacks-en", "langpacks-en",
-			"libertas-sd8686-firmware", "libertas-sd8787-firmware",
-			"libertas-usb8388-firmware", "nss", "plymouth", "rng-tools",
+			"firewalld", "iprutils", "ivtv-firmware", "iwl100-firmware",
+			"iwl1000-firmware", "iwl105-firmware", "iwl135-firmware",
+			"iwl2000-firmware", "iwl2030-firmware", "iwl3160-firmware",
+			"iwl5000-firmware", "iwl5150-firmware", "iwl6000g2a-firmware",
+			"iwl6000g2b-firmware", "iwl6050-firmware", "iwl7260-firmware",
+			"langpacks-*", "langpacks-en", "langpacks-en",
+			"libertas-sd8787-firmware", "nss", "plymouth", "rng-tools",
 			"udisks2",
 		},
 	}.Append(bootPackageSet(t)).Append(distroSpecificPackageSet(t))
@@ -341,16 +339,13 @@ func ec2CommonPackageSet(t *imageType) rpmmd.PackageSet {
 			"qemu-guest-agent",
 		},
 		Exclude: []string{
-			"aic94xx-firmware", "alsa-firmware",
-			"alsa-tools-firmware", "biosdevname", "firewalld", "iprutils", "ivtv-firmware",
+			"aic94xx-firmware", "alsa-firmware", "alsa-tools-firmware",
+			"biosdevname", "firewalld", "iprutils", "ivtv-firmware",
 			"iwl1000-firmware", "iwl100-firmware", "iwl105-firmware",
 			"iwl135-firmware", "iwl2000-firmware", "iwl2030-firmware",
-			"iwl3160-firmware", "iwl3945-firmware", "iwl4965-firmware",
-			"iwl5000-firmware", "iwl5150-firmware",
+			"iwl3160-firmware", "iwl5000-firmware", "iwl5150-firmware",
 			"iwl6000g2a-firmware", "iwl6000g2b-firmware", "iwl6050-firmware",
-			"iwl7260-firmware", "libertas-sd8686-firmware",
-			"libertas-sd8787-firmware", "libertas-usb8388-firmware",
-			"plymouth",
+			"iwl7260-firmware", "libertas-sd8787-firmware", "plymouth",
 		},
 	}.Append(bootPackageSet(t)).Append(distroSpecificPackageSet(t))
 }
@@ -486,8 +481,7 @@ func bareMetalPackageSet(t *imageType) rpmmd.PackageSet {
 			"@core", "dhcp-client", "dnf", "dnf-utils", "dosfstools",
 			"iwl1000-firmware", "iwl100-firmware", "iwl105-firmware",
 			"iwl135-firmware", "iwl2000-firmware", "iwl2030-firmware",
-			"iwl3160-firmware", "iwl3945-firmware", "iwl4965-firmware",
-			"iwl5000-firmware", "iwl5150-firmware",
+			"iwl3160-firmware", "iwl5000-firmware", "iwl5150-firmware",
 			"iwl6000g2a-firmware", "iwl6000g2b-firmware", "iwl6050-firmware",
 			"iwl7260-firmware", "lvm2", "net-tools", "NetworkManager",
 			"nfs-utils", "oddjob", "oddjob-mkhomedir", "policycoreutils",