diff --git a/build_files/shared/build.sh b/build_files/shared/build.sh
index 200be33b3d7..5ed24b81381 100755
--- a/build_files/shared/build.sh
+++ b/build_files/shared/build.sh
@@ -4,6 +4,9 @@ set -eoux pipefail
 
 echo "::group:: Copy Files"
 
+# Speeds up local builds
+dnf config-manager setopt keepcache=1
+
 # We need to remove this package here because lots of files we add from `projectbluefin/common` override the rpm files and they also go away when you do `dnf remove`
 dnf remove -y ublue-os-luks ublue-os-just ublue-os-udev-rules ublue-os-signing ublue-os-update-services
 
diff --git a/build_files/shared/clean-stage.sh b/build_files/shared/clean-stage.sh
index c5d6fd41bc7..5ee07e2fa7f 100755
--- a/build_files/shared/clean-stage.sh
+++ b/build_files/shared/clean-stage.sh
@@ -4,7 +4,9 @@ echo "::group:: ===$(basename "$0")==="
 
 set -eoux pipefail
 
-dnf clean all
+# Revert back to upstream defaults
+dnf config-manager setopt keepcache=0
+dnf versionlock clear
 
 systemctl mask flatpak-add-fedora-repos.service
 rm -f /usr/lib/systemd/system/flatpak-add-fedora-repos.service