diff --git a/Containerfile.common b/Containerfile.common
index 88edf81f..f3707bf0 100644
--- a/Containerfile.common
+++ b/Containerfile.common
@@ -14,11 +14,10 @@ ARG KERNEL_FLAVOR="{KERNEL_FLAVOR:-main}"
 ARG KERNEL_VERSION=""
 ARG RPMFUSION_MIRROR=""
 
-COPY build*.sh /tmp
+COPY build_files/common build_files/shared /tmp/
 COPY certs /tmp/certs
 
 # files for akmods
-COPY ublue-os-akmods-addons.spec /tmp/ublue-os-akmods-addons/ublue-os-akmods-addons.spec
 ADD https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/repo/fedora-${FEDORA_MAJOR_VERSION}/ublue-os-akmods-fedora-${FEDORA_MAJOR_VERSION}.repo \
     /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo
 ADD https://negativo17.org/repos/fedora-multimedia.repo \
@@ -47,11 +46,9 @@ RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \
 
 RUN cp /tmp/ublue-os-akmods-addons/rpmbuild/RPMS/noarch/ublue-os-akmods-addons*.rpm \
       /var/cache/rpms/ublue-os/
-RUN for RPM in $(find /var/cache/akmods/ -type f -name \*.rpm); do \
-        cp "${RPM}" /var/cache/rpms/kmods/; \
-    done
 
-RUN find /var/cache/rpms
+# Copy all RPMs from /var/cache/akmods/ to /var/cache/rpms/kmods/
+RUN /tmp/build-post.sh
 
 FROM scratch
 
diff --git a/Containerfile.extra b/Containerfile.extra
index b058748b..3886a949 100644
--- a/Containerfile.extra
+++ b/Containerfile.extra
@@ -14,11 +14,10 @@ ARG KERNEL_FLAVOR="{KERNEL_FLAVOR:-main}"
 ARG KERNEL_VERSION=""
 ARG RPMFUSION_MIRROR=""
 
-COPY build*.sh /tmp
+COPY build_files/extra build_files/shared /tmp/
 COPY certs /tmp/certs
 
 # files for akmods
-COPY ublue-os-akmods-addons.spec /tmp/ublue-os-akmods-addons/ublue-os-akmods-addons.spec
 ADD https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/repo/fedora-${FEDORA_MAJOR_VERSION}/ublue-os-akmods-fedora-${FEDORA_MAJOR_VERSION}.repo \
     /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo
 ADD https://negativo17.org/repos/fedora-multimedia.repo \
@@ -50,11 +49,8 @@ RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \
     /tmp/build-kmod-vhba.sh && \
     /tmp/build-kmod-VirtualBox.sh
 
-RUN for RPM in $(find /var/cache/akmods/ -type f -name \*.rpm); do \
-        cp "${RPM}" /var/cache/rpms/kmods/; \
-    done
-
-RUN find /var/cache/rpms
+# Copy all RPMs from /var/cache/akmods/ to /var/cache/rpms/kmods/
+RUN /tmp/build-post.sh
 
 FROM scratch
 
diff --git a/Containerfile.nvidia b/Containerfile.nvidia
index 232feb50..d04298b8 100644
--- a/Containerfile.nvidia
+++ b/Containerfile.nvidia
@@ -14,11 +14,10 @@ ARG KERNEL_FLAVOR="{KERNEL_FLAVOR:-main}"
 ARG KERNEL_VERSION=""
 ARG RPMFUSION_MIRROR=""
 
-COPY build*.sh /tmp
+COPY build_files/nvidia build_files/shared /tmp/
 COPY certs /tmp/certs
 
 # files for nvidia
-COPY ublue-os-nvidia-addons.spec /tmp/ublue-os-nvidia-addons/ublue-os-nvidia-addons.spec
 ADD https://nvidia.github.io/libnvidia-container/stable/rpm/nvidia-container-toolkit.repo \
     /tmp/ublue-os-nvidia-addons/rpmbuild/SOURCES/nvidia-container-toolkit.repo
 ADD https://copr.fedorainfracloud.org/coprs/eyecantcu/supergfxctl/repo/fedora-${FEDORA_MAJOR_VERSION}/eyecantcu-supergfxctl-fedora-${FEDORA_MAJOR_VERSION}.repo \
@@ -43,11 +42,9 @@ RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \
 
 RUN cp /tmp/ublue-os-nvidia-addons/rpmbuild/RPMS/noarch/ublue-os-nvidia-addons*.rpm \
       /var/cache/rpms/ublue-os/
-RUN for RPM in $(find /var/cache/akmods/ -type f -name \*.rpm); do \
-        cp "${RPM}" /var/cache/rpms/kmods/; \
-    done
 
-RUN find /var/cache/rpms
+# Copy all RPMs from /var/cache/akmods/ to /var/cache/rpms/kmods/
+RUN /tmp/build-post.sh
 
 FROM scratch
 
diff --git a/build-kmod-evdi.sh b/build_files/common/build-kmod-evdi.sh
similarity index 100%
rename from build-kmod-evdi.sh
rename to build_files/common/build-kmod-evdi.sh
diff --git a/build-kmod-framework-laptop.sh b/build_files/common/build-kmod-framework-laptop.sh
similarity index 100%
rename from build-kmod-framework-laptop.sh
rename to build_files/common/build-kmod-framework-laptop.sh
diff --git a/build-kmod-kvmfr.sh b/build_files/common/build-kmod-kvmfr.sh
similarity index 100%
rename from build-kmod-kvmfr.sh
rename to build_files/common/build-kmod-kvmfr.sh
diff --git a/build-kmod-openrazer.sh b/build_files/common/build-kmod-openrazer.sh
similarity index 100%
rename from build-kmod-openrazer.sh
rename to build_files/common/build-kmod-openrazer.sh
diff --git a/build-kmod-v4l2loopback.sh b/build_files/common/build-kmod-v4l2loopback.sh
similarity index 100%
rename from build-kmod-v4l2loopback.sh
rename to build_files/common/build-kmod-v4l2loopback.sh
diff --git a/build-kmod-wl.sh b/build_files/common/build-kmod-wl.sh
similarity index 100%
rename from build-kmod-wl.sh
rename to build_files/common/build-kmod-wl.sh
diff --git a/build-kmod-xone.sh b/build_files/common/build-kmod-xone.sh
similarity index 100%
rename from build-kmod-xone.sh
rename to build_files/common/build-kmod-xone.sh
diff --git a/build-kmod-xpadneo.sh b/build_files/common/build-kmod-xpadneo.sh
similarity index 100%
rename from build-kmod-xpadneo.sh
rename to build_files/common/build-kmod-xpadneo.sh
diff --git a/build-ublue-os-akmods-addons.sh b/build_files/common/build-ublue-os-akmods-addons.sh
similarity index 100%
rename from build-ublue-os-akmods-addons.sh
rename to build_files/common/build-ublue-os-akmods-addons.sh
diff --git a/ublue-os-akmods-addons.spec b/build_files/common/ublue-os-akmods-addons/ublue-os-akmods-addons.spec
similarity index 100%
rename from ublue-os-akmods-addons.spec
rename to build_files/common/ublue-os-akmods-addons/ublue-os-akmods-addons.spec
diff --git a/build-kmod-VirtualBox.sh b/build_files/extra/build-kmod-VirtualBox.sh
similarity index 100%
rename from build-kmod-VirtualBox.sh
rename to build_files/extra/build-kmod-VirtualBox.sh
diff --git a/build-kmod-ayaneo-platform.sh b/build_files/extra/build-kmod-ayaneo-platform.sh
similarity index 100%
rename from build-kmod-ayaneo-platform.sh
rename to build_files/extra/build-kmod-ayaneo-platform.sh
diff --git a/build-kmod-ayn-platform.sh b/build_files/extra/build-kmod-ayn-platform.sh
similarity index 100%
rename from build-kmod-ayn-platform.sh
rename to build_files/extra/build-kmod-ayn-platform.sh
diff --git a/build-kmod-bmi260.sh b/build_files/extra/build-kmod-bmi260.sh
similarity index 100%
rename from build-kmod-bmi260.sh
rename to build_files/extra/build-kmod-bmi260.sh
diff --git a/build-kmod-facetimehd.sh b/build_files/extra/build-kmod-facetimehd.sh
similarity index 100%
rename from build-kmod-facetimehd.sh
rename to build_files/extra/build-kmod-facetimehd.sh
diff --git a/build-kmod-gcadapter_oc.sh b/build_files/extra/build-kmod-gcadapter_oc.sh
similarity index 100%
rename from build-kmod-gcadapter_oc.sh
rename to build_files/extra/build-kmod-gcadapter_oc.sh
diff --git a/build-kmod-nct6687d.sh b/build_files/extra/build-kmod-nct6687d.sh
similarity index 100%
rename from build-kmod-nct6687d.sh
rename to build_files/extra/build-kmod-nct6687d.sh
diff --git a/build-kmod-openrgb.sh b/build_files/extra/build-kmod-openrgb.sh
similarity index 100%
rename from build-kmod-openrgb.sh
rename to build_files/extra/build-kmod-openrgb.sh
diff --git a/build-kmod-rtl8814au.sh b/build_files/extra/build-kmod-rtl8814au.sh
similarity index 100%
rename from build-kmod-rtl8814au.sh
rename to build_files/extra/build-kmod-rtl8814au.sh
diff --git a/build-kmod-rtl88xxau.sh b/build_files/extra/build-kmod-rtl88xxau.sh
similarity index 100%
rename from build-kmod-rtl88xxau.sh
rename to build_files/extra/build-kmod-rtl88xxau.sh
diff --git a/build-kmod-ryzen-smu.sh b/build_files/extra/build-kmod-ryzen-smu.sh
similarity index 100%
rename from build-kmod-ryzen-smu.sh
rename to build_files/extra/build-kmod-ryzen-smu.sh
diff --git a/build-kmod-vhba.sh b/build_files/extra/build-kmod-vhba.sh
similarity index 100%
rename from build-kmod-vhba.sh
rename to build_files/extra/build-kmod-vhba.sh
diff --git a/build-kmod-zenergy.sh b/build_files/extra/build-kmod-zenergy.sh
similarity index 100%
rename from build-kmod-zenergy.sh
rename to build_files/extra/build-kmod-zenergy.sh
diff --git a/build-kmod-nvidia.sh b/build_files/nvidia/build-kmod-nvidia.sh
similarity index 100%
rename from build-kmod-nvidia.sh
rename to build_files/nvidia/build-kmod-nvidia.sh
diff --git a/build-ublue-os-nvidia-addons.sh b/build_files/nvidia/build-ublue-os-nvidia-addons.sh
similarity index 100%
rename from build-ublue-os-nvidia-addons.sh
rename to build_files/nvidia/build-ublue-os-nvidia-addons.sh
diff --git a/ublue-os-nvidia-addons.spec b/build_files/nvidia/ublue-os-nvidia-addons/ublue-os-nvidia-addons.spec
similarity index 100%
rename from ublue-os-nvidia-addons.spec
rename to build_files/nvidia/ublue-os-nvidia-addons/ublue-os-nvidia-addons.spec
diff --git a/build_files/shared/build-post.sh b/build_files/shared/build-post.sh
new file mode 100755
index 00000000..91bd0cfa
--- /dev/null
+++ b/build_files/shared/build-post.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -oeux pipefail
+
+for RPM in $(find /var/cache/akmods/ -type f -name \*.rpm); do \
+    cp "${RPM}" /var/cache/rpms/kmods/; \
+done
+
+find /var/cache/rpms
diff --git a/build-prep.sh b/build_files/shared/build-prep.sh
similarity index 100%
rename from build-prep.sh
rename to build_files/shared/build-prep.sh