diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fab26636..7b2190d5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -115,8 +115,8 @@ jobs:
       if: ${{ ! startsWith(matrix.name, 'rubik') }}
       run: |
         sudo mv ${{ steps.install_deps.outputs.image }} photonvision_${{ matrix.name }}.img
-        sudo xz -T 0 -v photonvision_${{ matrix.name }}.img
-        echo "artifact=photonvision_${{ matrix.name }}.img.xz" >> "$GITHUB_ENV"
+        sudo zstd -10 -v photonvision_${{ matrix.name }}.img
+        echo "artifact=photonvision_${{ matrix.name }}.img.zst" >> "$GITHUB_ENV"
 
     - name: Tar built image
       # Build the RubikPi3-specific tar file
@@ -138,12 +138,12 @@ jobs:
         sudo find ${tardir} -mindepth 1 -type d -empty -delete
         echo "Contents of tardir: ${tardir}"
         ls -la ${tardir}
-        sudo tar -I 'xz -T0' --create --file=${target}.tar.xz ${tardir} --checkpoint=10000 --checkpoint-action=echo='%T'
+        sudo tar -I 'zstd -10' --create --file=${target}.tar.zst ${tardir} --checkpoint=10000 --checkpoint-action=echo='%T'
         echo "Contents of tar file:"
         # Expenive operation (has to unzip the file), only use for debugging
         # echo "Contents of tar file:"
-        # tar --list --file=${target}.tar.xz
-        echo "artifact=${target}.tar.xz" >> "$GITHUB_ENV"
+        # tar --list --file=${target}.tar.zst
+        echo "artifact=${target}.tar.zst" >> "$GITHUB_ENV"
 
     - uses: actions/upload-artifact@v7
       with:
@@ -167,5 +167,5 @@ jobs:
           tag: 'Dev'
           rm: true
           files: |
-            **/*.xz
+            **/*.zst
         if: github.event_name == 'push'