diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index 1fe43a5..82cae34 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -101,7 +101,6 @@ jobs:
 
   publish-npm:
     name: Publish to npm
-    if: github.event_name == 'release'
     runs-on: ubuntu-latest
 
     steps:
@@ -133,8 +132,15 @@ jobs:
           cp README.md packages/safe-chain/
           cp LICENSE packages/safe-chain/
           cp -r docs packages/safe-chain/
+          cp npm-shrinkwrap.json packages/safe-chain/
 
       - name: Publish to npm
         run: |
-          echo "Publishing version ${{ github.event.release.tag_name }} to NPM"
-          npm publish --workspace=packages/safe-chain --access public --provenance
+          VERSION="${{ github.event.release.tag_name }}"
+          echo "Publishing version $VERSION to NPM"
+          if [[ "$VERSION" == *"-"* ]]; then
+            PRERELEASE_TAG=$(echo "$VERSION" | sed 's/.*-\([^-]*\)$/\1/')
+            npm publish --workspace=packages/safe-chain --access public --provenance --tag "$PRERELEASE_TAG"
+          else
+            npm publish --workspace=packages/safe-chain --access public --provenance
+          fi