diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml
index d58d72c4dd..d2fd41a14b 100644
--- a/manifests/fedora-coreos-base.yaml
+++ b/manifests/fedora-coreos-base.yaml
@@ -157,8 +157,6 @@ packages:
   - iptables-legacy
   # GPU Firmware files (not broken out into subpackage of linux-firmware in RHEL yet)
   - amd-gpu-firmware intel-gpu-firmware nvidia-gpu-firmware
-  # Wifi/BT firmware files https://github.com/coreos/fedora-coreos-tracker/issues/1575
-  - atheros-firmware brcmfmac-firmware mt7xxx-firmware realtek-firmware nxpwireless-firmware tiwilink-firmware
 
 
 # - irqbalance
diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml
index de30f75895..0be3297d23 100644
--- a/manifests/fedora-coreos.yaml
+++ b/manifests/fedora-coreos.yaml
@@ -43,6 +43,9 @@ conditional-include:
     include: exclude-dnf.yaml
   - if: releasever >= 41
     include: include-dnf.yaml
+  # Wifi firmwares will be dropped in F41
+  - if: releasever < 41
+    include: wifi-firmwares.yaml
 
 ostree-layers:
   - overlay/15fcos
diff --git a/manifests/wifi-firmwares.yaml b/manifests/wifi-firmwares.yaml
new file mode 100644
index 0000000000..6875ff7319
--- /dev/null
+++ b/manifests/wifi-firmwares.yaml
@@ -0,0 +1,9 @@
+# Wifi/BT firmware files kept in FCOS until the F41 rebase
+# See: https://github.com/coreos/fedora-coreos-tracker/issues/1575
+packages:
+  - atheros-firmware
+  - brcmfmac-firmware
+  - mt7xxx-firmware
+  - nxpwireless-firmware
+  - realtek-firmware
+  - tiwilink-firmware