diff --git a/Containerfile b/Containerfile
index 44a20352e5e..841ad2ce874 100644
--- a/Containerfile
+++ b/Containerfile
@@ -37,13 +37,6 @@ COPY --from=akmods /rpms /tmp/akmods-rpms
 
 # Build, cleanup, commit.
 RUN rpm-ostree cliwrap install-to-root / && \
-    mkdir -p /tmp/mediatek-firmware && \
-    curl -Lo /tmp/mediatek-firmware/WIFI_MT7922_patch_mcu_1_1_hdr.bin https://gitlab.com/kernel-firmware/linux-firmware/-/raw/8f08053b2a7474e210b03dbc2b4ba59afbe98802/mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin?inline=false && \
-    curl -Lo /tmp/mediatek-firmware/WIFI_RAM_CODE_MT7922_1.bin https://gitlab.com/kernel-firmware/linux-firmware/-/raw/8f08053b2a7474e210b03dbc2b4ba59afbe98802/mediatek/WIFI_RAM_CODE_MT7922_1.bin?inline=false && \
-    xz --check=crc32 /tmp/mediatek-firmware/WIFI_MT7922_patch_mcu_1_1_hdr.bin && \
-    xz --check=crc32 /tmp/mediatek-firmware/WIFI_RAM_CODE_MT7922_1.bin && \
-    mv -vf /tmp/mediatek-firmware/* /usr/lib/firmware/mediatek/ && \
-    rm -rf /tmp/mediatek-firmware && \
     bash -c ". /tmp/build/build-base.sh"  && \
     rm -rf /tmp/* /var/* && \
     mkdir -p /var/tmp && \
diff --git a/build_files/base/build-base.sh b/build_files/base/build-base.sh
index f405278fa36..922d65c9e0a 100644
--- a/build_files/base/build-base.sh
+++ b/build_files/base/build-base.sh
@@ -3,6 +3,7 @@
 
 set -ouex pipefail
 
+. /tmp/build/firmware.sh
 . /tmp/build/copr-repos.sh
 . /tmp/build/install-akmods.sh
 . /tmp/build/packages.sh
diff --git a/build_files/base/firmware.sh b/build_files/base/firmware.sh
new file mode 100644
index 00000000000..572dde0bfaa
--- /dev/null
+++ b/build_files/base/firmware.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/bash
+
+set -xeuo pipefail
+
+mkdir -p /tmp/mediatek-firmware
+curl -Lo /tmp/mediatek-firmware/WIFI_MT7922_patch_mcu_1_1_hdr.bin https://gitlab.com/kernel-firmware/linux-firmware/-/raw/8f08053b2a7474e210b03dbc2b4ba59afbe98802/mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin?inline=false
+curl -Lo /tmp/mediatek-firmware/WIFI_RAM_CODE_MT7922_1.bin https://gitlab.com/kernel-firmware/linux-firmware/-/raw/8f08053b2a7474e210b03dbc2b4ba59afbe98802/mediatek/WIFI_RAM_CODE_MT7922_1.bin?inline=false
+xz --check=crc32 /tmp/mediatek-firmware/WIFI_MT7922_patch_mcu_1_1_hdr.bin
+xz --check=crc32 /tmp/mediatek-firmware/WIFI_RAM_CODE_MT7922_1.bin
+mv -vf /tmp/mediatek-firmware/* /usr/lib/firmware/mediatek/
+rm -rf /tmp/mediatek-firmware