diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
index c667c4356e..f4e129ae68 100644
--- a/.github/workflows/packages.yml
+++ b/.github/workflows/packages.yml
@@ -169,7 +169,7 @@ jobs:
           ./scripts/lint-packages.sh $package_recipes
         fi
 
-    - name: Build packages
+    - name: Free additional disk space (if necessary)
       run: |
         declare -a packages
         for repo_path in $(jq --raw-output 'del(.pkg_format) | keys | .[]' repo.json); do
@@ -184,10 +184,27 @@ jobs:
           if grep -qP "(^|\\s)${packages// /($|\\s)|(^|\\s)}($|\\s)" ./scripts/big-pkgs.list; then
             ./scripts/setup-ubuntu.sh
             sudo apt install ninja-build
-            sudo apt purge -yq $(dpkg -l | grep '^ii' | awk '{ print $2 }' | grep -P '(aspnetcore|cabal-|dotnet-|ghc-|libmono|php)') \
-              firefox google-chrome-stable microsoft-edge-stable mono-runtime-common monodoc-manual ruby
+            sudo apt purge -yq $(dpkg -l | grep '^ii' | awk '{ print $2 }' | grep -P '(aspnetcore|cabal-|dotnet-|ghc-|libmono|mongodb-|mysql-|php)') \
+              firefox google-chrome-stable microsoft-edge-stable mono-devel mono-runtime-common monodoc-manual ruby
             sudo apt autoremove -yq
-            sudo rm -fr /opt/hostedtoolcache /usr/share/dotnet /usr/share/swift
+            sudo apt clean
+            sudo rm -fr /opt/hostedtoolcache /usr/lib/node_modules /usr/share/dotnet /usr/share/swift
+          fi
+        fi
+
+    - name: Build packages
+      run: |
+        declare -a packages
+        for repo_path in $(jq --raw-output 'del(.pkg_format) | keys | .[]' repo.json); do
+          repo=$(jq --raw-output '.["'${repo_path}'"].name' repo.json)
+
+          if [ -f ./built_${repo}_packages.txt ]; then
+            packages="$packages $(cat ./built_${repo}_packages.txt | tr '\n' ' ')"
+          fi
+        done
+
+        if [ ! -z "$packages" ]; then
+          if grep -qP "(^|\\s)${packages// /($|\\s)|(^|\\s)}($|\\s)" ./scripts/big-pkgs.list; then
             NDK=$ANDROID_NDK_LATEST_HOME ANDROID_HOME=$ANDROID_SDK_ROOT ./build-package.sh -I -a ${{ matrix.target_arch }} $packages
           else
             ./scripts/run-docker.sh ./build-package.sh -I -a ${{ matrix.target_arch }} $packages
diff --git a/scripts/big-pkgs.list b/scripts/big-pkgs.list
index e57d95fdbd..c2c76e6b47 100644
--- a/scripts/big-pkgs.list
+++ b/scripts/big-pkgs.list
@@ -1,5 +1,7 @@
+bionic-host
 clvk
 dart
+firefox
 libllvm
 rust
 rustc-nightly
@@ -7,5 +9,3 @@ swift
 tinygo
 wasmer
 zig
-firefox
-bionic-host