diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2d25b371d9..3db043f47e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,10 +32,12 @@ package:
     name: "BizHawk_devbuild_${CI_COMMIT_REF_SLUG}_$CI_COMMIT_SHORT_SHA"
     paths:
       - packaged_output/*
+  image: ubuntu:focal
   rules:
     - if: '$CI_COMMIT_REF_SLUG == "master"'
       when: always
   script:
+    - su -c "apt-get update && apt-get -y install p7zip-full"
     - Dist/Package.sh
   stage: package
 
diff --git a/Dist/Package.sh b/Dist/Package.sh
index 7eb35b222b..fb2bd4518d 100755
--- a/Dist/Package.sh
+++ b/Dist/Package.sh
@@ -3,4 +3,7 @@ set -e
 cd "$(dirname "$0")/.."
 rm -fr "packaged_output" && mkdir -p "packaged_output"
 find "output" -type f \( -wholename "output/EmuHawk.exe" -o -wholename "output/DiscoHawk.exe" -o -wholename "output/*.config" -o -wholename "output/defctrl.json" -o -wholename "output/EmuHawkMono.sh" -o -wholename "output/dll/*" -o -wholename "output/Shaders/*" -o -wholename "output/gamedb/*" -o -wholename "output/Tools/*" -o -wholename "output/NES/Palettes/*" -o -wholename "output/Lua/*" -o -wholename "output/Gameboy/Palettes/*" \) -not -name "*.pdb" -not -name "*.lib" -not -name "*.pgd" -not -name "*.ipdb" -not -name "*.iobj" -not -name "*.exp" -not -wholename "output/dll/libsneshawk-64*.exe" -not -name "*.ilk" -not -wholename "output/dll/gpgx.elf" -not -wholename "output/dll/miniclient.*" -exec install -D -m644 -T "{}" "packaged_{}" \;
+find "packaged_output/dll" -type f -name "*.xml" -exec rm "{}" \;
+mkdir "packaged_output/Firmware"
+cd "packaged_output/gamedb" && 7za a -t7z -mx9 "NesCarts.7z" "NesCarts.xml" && rm "NesCarts.xml" && cd "../.."
 find "packaged_output" -type f -name "*.sh" -exec chmod +x {} \; # installed with -m644 but needs to be 755