diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4a2dcdf..7bde97f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,3 +15,10 @@ jobs:
         uses: gradle/gradle-build-action@v2
         with:
           arguments: build check
+      - name: Organize Artifacts
+        run: ./tools/organize-artifacts.sh
+      - uses: actions/upload-artifact@v3
+        with:
+          name: foundation-build.zip
+          path: |
+            artifacts/*
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9b434ce..01bbda9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,3 +28,8 @@ jobs:
           ARTIFACTS_KEY_ID: "${{ secrets.ARTIFACTS_KEY_ID }}"
           ARTIFACTS_APP_KEY: "${{ secrets.ARTIFACTS_APP_KEY }}"
           ARTIFACTS_BUCKET: "${{ secrets.ARTIFACTS_BUCKET }}"
+      - uses: actions/upload-artifact@v3
+        with:
+          name: foundation-build.zip
+          path: |
+            artifacts/*