diff --git a/.github/workflows/carbonix_build.yml b/.github/workflows/carbonix_build.yml
index c48f7a245c..6aa2e85359 100644
--- a/.github/workflows/carbonix_build.yml
+++ b/.github/workflows/carbonix_build.yml
@@ -341,6 +341,13 @@ jobs:
           echo "Uploading Artifacts to: $PATH_TO_S3"
           aws s3 cp final-output/ $PATH_TO_S3 --recursive
 
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: output-ac-${{ matrix.xml_file }}
+          path: final-output/
+          retention-days: 15
+
   build-sitl:
     runs-on: 'windows-latest'
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'SKIP_BUILD') }}
@@ -446,3 +453,32 @@ jobs:
           $env:PATH_TO_S3 = '${{ needs.setup-s3-path.outputs.s3_path }}'
           echo "Uploading to: $env:PATH_TO_S3"
           aws s3 cp temp/ $env:PATH_TO_S3 --recursive
+
+  build-upload-zip:
+    runs-on: ubuntu-22.04
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'SKIP_BUILD') }}
+    needs: [build-periph, build-sitl, collect-aircraft-config-files, setup-s3-path]
+    steps:
+      - name: Create folder from s3_path
+        run: mkdir -p ${{ needs.setup-s3-path.outputs.s3_path }}
+
+      - name: Download build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: output-ac-*
+          path: ${{ needs.setup-s3-path.outputs.s3_path }}
+
+      - name: List downloaded files
+        run: ls -R ${{ needs.setup-s3-path.outputs.s3_path }}
+
+      - name: Zip the folder
+        run: |
+          cd ${{ needs.setup-s3-path.outputs.s3_path }}
+          zip -r ../artifact.zip .
+
+      - name: Upload zipped folder to artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: zipped-artifacts
+          path: artifact.zip
+          retention-days: 15