diff --git a/Containerfile.in b/Containerfile.in
index a031b7bd2..2063d1b1e 100644
--- a/Containerfile.in
+++ b/Containerfile.in
@@ -21,7 +21,7 @@ FROM ghcr.io/ublue-os/akmods-zfs:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION}-${KERN
 #endif
 
 FROM scratch AS ctx
-COPY /build_files /build_files
+COPY /build_scripts /build_scripts
 
 # /* https://github.com/get-aurora-dev/common */
 COPY --from=common /logos /system_files/shared
@@ -64,10 +64,10 @@ RUN --mount=type=tmpfs,dst=/boot \
     --mount=type=bind,from=akmods,src=/rpms/common,dst=/tmp/rpms/common \
     --mount=type=bind,from=akmods,src=/rpms/kmods,dst=/tmp/rpms/kmods \
     --mount=type=secret,id=GITHUB_TOKEN \
-    /ctx/build_files/shared/build.sh && \
-    /ctx/build_files/base/01-packages.sh && \
-    /ctx/build_files/base/02-install-common-kernel-akmods.sh && \
-    /ctx/build_files/base/03-fetch.sh
+    /ctx/build_scripts/shared/build.sh && \
+    /ctx/build_scripts/base/01-packages.sh && \
+    /ctx/build_scripts/base/02-install-common-kernel-akmods.sh && \
+    /ctx/build_scripts/base/03-fetch.sh
 #endif
 
 # /* aurora:stable with zfs no nvidia */
@@ -81,11 +81,11 @@ RUN --mount=type=tmpfs,dst=/boot \
     --mount=type=bind,from=akmods,src=/rpms/kmods,dst=/tmp/rpms/kmods \
     --mount=type=bind,from=akmods-zfs,src=/rpms/kmods/zfs,dst=/tmp/rpms/kmods/zfs \
     --mount=type=secret,id=GITHUB_TOKEN \
-    /ctx/build_files/shared/build.sh && \
-    /ctx/build_files/base/01-packages.sh && \
-    /ctx/build_files/base/02-install-common-kernel-akmods.sh && \
-    /ctx/build_files/base/zfs.sh && \
-    /ctx/build_files/base/03-fetch.sh
+    /ctx/build_scripts/shared/build.sh && \
+    /ctx/build_scripts/base/01-packages.sh && \
+    /ctx/build_scripts/base/02-install-common-kernel-akmods.sh && \
+    /ctx/build_scripts/base/zfs.sh && \
+    /ctx/build_scripts/base/03-fetch.sh
 #endif
 
 # /* aurora-nvidia-open:latest no zfs */
@@ -99,11 +99,11 @@ RUN --mount=type=tmpfs,dst=/boot \
     --mount=type=bind,from=akmods,src=/rpms/kmods,dst=/tmp/rpms/kmods \
     --mount=type=bind,from=akmods-nvidia-open,src=/rpms,dst=/tmp/rpms/nvidia \
     --mount=type=secret,id=GITHUB_TOKEN \
-    /ctx/build_files/shared/build.sh && \
-    /ctx/build_files/base/01-packages.sh && \
-    /ctx/build_files/base/02-install-common-kernel-akmods.sh && \
-    /ctx/build_files/base/03-fetch.sh && \
-    /ctx/build_files/base/04-nvidia.sh
+    /ctx/build_scripts/shared/build.sh && \
+    /ctx/build_scripts/base/01-packages.sh && \
+    /ctx/build_scripts/base/02-install-common-kernel-akmods.sh && \
+    /ctx/build_scripts/base/03-fetch.sh && \
+    /ctx/build_scripts/base/04-nvidia.sh
 #endif
 
 # /* aurora-nvidia-open:stable with ZFS */
@@ -118,25 +118,25 @@ RUN --mount=type=tmpfs,dst=/boot \
     --mount=type=bind,from=akmods-nvidia-open,src=/rpms,dst=/tmp/rpms/nvidia \
     --mount=type=bind,from=akmods-zfs,src=/rpms/kmods/zfs,dst=/tmp/rpms/kmods/zfs \
     --mount=type=secret,id=GITHUB_TOKEN \
-    /ctx/build_files/shared/build.sh && \
-    /ctx/build_files/base/01-packages.sh && \
-    /ctx/build_files/base/02-install-common-kernel-akmods.sh && \
-    /ctx/build_files/base/03-fetch.sh && \
-    /ctx/build_files/base/04-nvidia.sh && \
-    /ctx/build_files/base/zfs.sh
+    /ctx/build_scripts/shared/build.sh && \
+    /ctx/build_scripts/base/01-packages.sh && \
+    /ctx/build_scripts/base/02-install-common-kernel-akmods.sh && \
+    /ctx/build_scripts/base/03-fetch.sh && \
+    /ctx/build_scripts/base/04-nvidia.sh && \
+    /ctx/build_scripts/base/zfs.sh
 #endif
 
 # /* Everything that can be done offline after things are in place should be done here */
 RUN --network=none \
     --mount=type=tmpfs,dst=/boot \
     --mount=type=bind,from=ctx,source=/,target=/ctx \
-    /ctx/build_files/base/16-override-install.sh && \
-    /ctx/build_files/base/17-cleanup.sh && \
-    /ctx/build_files/base/18-image-info.sh && \
-    /ctx/build_files/base/19-initramfs.sh && \
-    /ctx/build_files/shared/validate-repos.sh && \
-    /ctx/build_files/shared/clean-stage.sh && \
-    /ctx/build_files/base/20-tests.sh
+    /ctx/build_scripts/base/16-override-install.sh && \
+    /ctx/build_scripts/base/17-cleanup.sh && \
+    /ctx/build_scripts/base/18-image-info.sh && \
+    /ctx/build_scripts/base/19-initramfs.sh && \
+    /ctx/build_scripts/shared/validate-repos.sh && \
+    /ctx/build_scripts/shared/clean-stage.sh && \
+    /ctx/build_scripts/base/20-tests.sh
 
 CMD ["/sbin/init"]
 
diff --git a/build_files/base/01-packages.sh b/build_scripts/base/01-packages.sh
similarity index 97%
rename from build_files/base/01-packages.sh
rename to build_scripts/base/01-packages.sh
index e128e61e0..4eabe7c48 100755
--- a/build_files/base/01-packages.sh
+++ b/build_scripts/base/01-packages.sh
@@ -32,8 +32,8 @@ dnf5 distro-sync --skip-unavailable -y --repo='fedora-multimedia' "${OVERRIDES[@
 dnf5 versionlock add "${OVERRIDES[@]}"
 
 # All DNF-related operations should be done here whenever possible
-#shellcheck source=build_files/shared/copr-helpers.sh
-source /ctx/build_files/shared/copr-helpers.sh
+#shellcheck source=build_scripts/shared/copr-helpers.sh
+source /ctx/build_scripts/shared/copr-helpers.sh
 
 # NOTE:
 # Packages are split into FEDORA_PACKAGES and COPR_PACKAGES to prevent
@@ -215,7 +215,7 @@ dnf versionlock add plasma-setup
 
 # Install DX specific packages
 if [[ "${IMAGE_FLAVOR}" == "dx" ]]; then
-  /ctx/build_files/dx/00-dx.sh
+  /ctx/build_scripts/dx/00-dx.sh
 fi
 
 echo "::endgroup::"
diff --git a/build_files/base/02-install-common-kernel-akmods.sh b/build_scripts/base/02-install-common-kernel-akmods.sh
similarity index 100%
rename from build_files/base/02-install-common-kernel-akmods.sh
rename to build_scripts/base/02-install-common-kernel-akmods.sh
diff --git a/build_files/base/03-fetch.sh b/build_scripts/base/03-fetch.sh
similarity index 100%
rename from build_files/base/03-fetch.sh
rename to build_scripts/base/03-fetch.sh
diff --git a/build_files/base/04-nvidia.sh b/build_scripts/base/04-nvidia.sh
similarity index 100%
rename from build_files/base/04-nvidia.sh
rename to build_scripts/base/04-nvidia.sh
diff --git a/build_files/base/16-override-install.sh b/build_scripts/base/16-override-install.sh
similarity index 100%
rename from build_files/base/16-override-install.sh
rename to build_scripts/base/16-override-install.sh
diff --git a/build_files/base/17-cleanup.sh b/build_scripts/base/17-cleanup.sh
similarity index 100%
rename from build_files/base/17-cleanup.sh
rename to build_scripts/base/17-cleanup.sh
diff --git a/build_files/base/18-image-info.sh b/build_scripts/base/18-image-info.sh
similarity index 100%
rename from build_files/base/18-image-info.sh
rename to build_scripts/base/18-image-info.sh
diff --git a/build_files/base/19-initramfs.sh b/build_scripts/base/19-initramfs.sh
similarity index 100%
rename from build_files/base/19-initramfs.sh
rename to build_scripts/base/19-initramfs.sh
diff --git a/build_files/base/20-tests.sh b/build_scripts/base/20-tests.sh
similarity index 99%
rename from build_files/base/20-tests.sh
rename to build_scripts/base/20-tests.sh
index 165b00e1f..8eb1f09ed 100755
--- a/build_files/base/20-tests.sh
+++ b/build_scripts/base/20-tests.sh
@@ -175,7 +175,7 @@ for unit in "${IMPORTANT_UNITS[@]}"; do
 done
 
 if [[ "${IMAGE_FLAVOR}" == "dx" ]]; then
-  /ctx/build_files/dx/10-tests-dx.sh;
+  /ctx/build_scripts/dx/10-tests-dx.sh;
 fi
 
 echo "::endgroup::"
diff --git a/build_files/base/zfs.sh b/build_scripts/base/zfs.sh
similarity index 100%
rename from build_files/base/zfs.sh
rename to build_scripts/base/zfs.sh
diff --git a/build_files/dx/00-dx.sh b/build_scripts/dx/00-dx.sh
similarity index 97%
rename from build_files/dx/00-dx.sh
rename to build_scripts/dx/00-dx.sh
index aeb236ad1..9d08380cb 100755
--- a/build_files/dx/00-dx.sh
+++ b/build_scripts/dx/00-dx.sh
@@ -5,8 +5,8 @@ echo "::group:: ===$(basename "$0")==="
 set -ouex pipefail
 
 # Load secure COPR helpers
-# shellcheck source=build_files/shared/copr-helpers.sh
-source /ctx/build_files/shared/copr-helpers.sh
+# shellcheck source=build_scripts/shared/copr-helpers.sh
+source /ctx/build_scripts/shared/copr-helpers.sh
 
 # NOTE:
 # Packages are split into FEDORA_PACKAGES and COPR_PACKAGES to prevent
diff --git a/build_files/dx/10-tests-dx.sh b/build_scripts/dx/10-tests-dx.sh
similarity index 100%
rename from build_files/dx/10-tests-dx.sh
rename to build_scripts/dx/10-tests-dx.sh
diff --git a/build_files/shared/build-dx.sh b/build_scripts/shared/build-dx.sh
similarity index 100%
rename from build_files/shared/build-dx.sh
rename to build_scripts/shared/build-dx.sh
diff --git a/build_files/shared/build.sh b/build_scripts/shared/build.sh
similarity index 92%
rename from build_files/shared/build.sh
rename to build_scripts/shared/build.sh
index c55a33e63..eeb22046f 100755
--- a/build_files/shared/build.sh
+++ b/build_scripts/shared/build.sh
@@ -32,10 +32,10 @@ setfattr -n user.component -v "aurora-config" /usr/share/ublue-os
 setfattr -n user.component -v "homebrew" /usr/share/homebrew.tar.zst
 
 if [[ "${IMAGE_FLAVOR}" == "dx" ]]; then
-  /ctx/build_files/shared/build-dx.sh
+  /ctx/build_scripts/shared/build-dx.sh
 fi
 
 mkdir -p /tmp/scripts/helpers
-install -Dm0755 /ctx/build_files/shared/utils/ghcurl /tmp/scripts/helpers/ghcurl
+install -Dm0755 /ctx/build_scripts/shared/utils/ghcurl /tmp/scripts/helpers/ghcurl
 
 echo "::endgroup::"
diff --git a/build_files/shared/clean-stage.sh b/build_scripts/shared/clean-stage.sh
similarity index 100%
rename from build_files/shared/clean-stage.sh
rename to build_scripts/shared/clean-stage.sh
diff --git a/build_files/shared/copr-helpers.sh b/build_scripts/shared/copr-helpers.sh
similarity index 100%
rename from build_files/shared/copr-helpers.sh
rename to build_scripts/shared/copr-helpers.sh
diff --git a/build_files/shared/utils/ghcurl b/build_scripts/shared/utils/ghcurl
similarity index 100%
rename from build_files/shared/utils/ghcurl
rename to build_scripts/shared/utils/ghcurl
diff --git a/build_files/shared/validate-repos.sh b/build_scripts/shared/validate-repos.sh
similarity index 100%
rename from build_files/shared/validate-repos.sh
rename to build_scripts/shared/validate-repos.sh