diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index 2e0c2f1..3ac0b62 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -65,3 +65,25 @@ jobs:
           npm publish --workspace=packages/safe-chain-bun --access public
         env:
           NPM_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
+
+      - name: Pack safe-chain tarball
+        run: |
+          cd packages/safe-chain
+          npm pack
+
+      - name: Pack safe-chain-bun tarball
+        run: |
+          cd packages/safe-chain-bun
+          npm pack
+
+      - name: Upload safe-chain tarball
+        uses: actions/upload-artifact@v3
+        with:
+          name: aikidosec-safe-chain-${{ steps.get_version.outputs.tag }}
+          path: packages/safe-chain/aikidosec-safe-chain-*.tgz
+
+      - name: Upload safe-chain-bun tarball
+        uses: actions/upload-artifact@v3
+        with:
+          name: aikidosec-safe-chain-bun-${{ steps.get_version.outputs.tag }}
+          path: packages/safe-chain-bun/aikidosec-safe-chain-bun-*.tgz
diff --git a/.github/workflows/test-on-pr.yml b/.github/workflows/test-on-pr.yml
index e3d2b90..55c8dc2 100644
--- a/.github/workflows/test-on-pr.yml
+++ b/.github/workflows/test-on-pr.yml
@@ -31,11 +31,17 @@ jobs:
           npm pack --workspace=packages/safe-chain
           npm pack --workspace=packages/safe-chain-bun
 
-      - name: Upload package tarballs
-        uses: actions/upload-artifact@v4
+      - name: Upload safe-chain tarball
+        uses: actions/upload-artifact@v3
         with:
-          name: safe-chain-packages
-          path: aikidosec-*.tgz
+          name: aikidosec-safe-chain-1.0.0.tgz
+          path: packages/safe-chain/aikidosec-safe-chain-*.tgz
+
+      - name: Upload safe-chain-bun tarball
+        uses: actions/upload-artifact@v3
+        with:
+          name: aikidosec-safe-chain-bun-1.0.0.tgz
+          path: packages/safe-chain-bun/aikidosec-safe-chain-bun-*.tgz
 
   e2e-tests:
     name: Run E2E tests