diff --git a/.github/workflows/publish-prerelease.yml b/.github/workflows/publish-prerelease.yml
new file mode 100644
index 0000000..bf9ebea
--- /dev/null
+++ b/.github/workflows/publish-prerelease.yml
@@ -0,0 +1,82 @@
+# yaml-language-server: $schema=https://www.schemastore.org/github-workflow.json
+---
+name: Publish Prerelease
+
+on:
+  workflow_call:
+    inputs:
+      ref:
+        description: 'Git ref to publish'
+        required: true
+        type: string
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    environment: staging
+    name: Publish prerelease to NPM
+    permissions:
+      contents: write
+      id-token: write
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref }}
+          fetch-depth: 0
+
+      - name: Install node 20
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: npm
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Update npm
+        run: npm install -g npm@11.5.1
+
+      - name: Configure git
+        run: |
+          git config user.name "${{ github.actor }}"
+          git config user.email "${{ github.actor }}@users.noreply.github.com"
+
+      - name: Update package with new version
+        id: bump
+        run: |
+          echo "version=$(npm version prerelease --no-git-tag-version --preid ea)" >> "$GITHUB_OUTPUT"
+
+      - name: Install project modules
+        run: npm ci
+
+      - name: Compile project
+        run: npm run compile
+
+      - name: Publish package
+        env:
+          NPM_CONFIG_PROVENANCE: true
+        run: npm publish --tag prerelease
+
+      - name: Commit and push package modifications
+        run: |
+          git add package.json
+          git add package-lock.json
+          git commit -m "build: updated package with ${{ steps.bump.outputs.version }} [skip ci]"
+          git push
+
+      - name: Create and push new tag
+        run: |
+          git tag ${{ steps.bump.outputs.version }} -m "${{ steps.bump.outputs.version }}"
+          git push origin ${{ steps.bump.outputs.version }}
+
+      - name: Create a release
+        uses: actions/github-script@v6.4.1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const repo_name = context.payload.repository.full_name
+            const response = await github.request('POST /repos/' + repo_name + '/releases', {
+              tag_name: '${{ steps.bump.outputs.version }}',
+              name: '${{ steps.bump.outputs.version }}',
+              prerelease: true,
+              generate_release_notes: true
+            })
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
new file mode 100644
index 0000000..1e6b67b
--- /dev/null
+++ b/.github/workflows/publish-release.yml
@@ -0,0 +1,113 @@
+# yaml-language-server: $schema=https://www.schemastore.org/github-workflow.json
+---
+name: Publish Release
+
+on:
+  workflow_call:
+    inputs:
+      ref:
+        description: 'Git ref to publish'
+        required: true
+        type: string
+      version_type:
+        description: 'Type of version bump'
+        required: true
+        type: string
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    environment: staging
+    name: Publish release to NPM
+    permissions:
+      contents: write
+      id-token: write
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref }}
+          fetch-depth: 0
+
+      - name: Install node 20
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: npm
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Update npm
+        run: npm install -g npm@11.5.1
+
+      - name: Configure git
+        run: |
+          git config user.name "${{ github.actor }}"
+          git config user.email "${{ github.actor }}@users.noreply.github.com"
+
+      - name: Get previous released annotated tag
+        id: last-release
+        run: |
+          echo "base-tag=$(git describe | awk -F '-' '{print $1}')" >> "$GITHUB_OUTPUT"
+          echo "full-tag=$(git describe)" >> "$GITHUB_OUTPUT"
+
+      - name: Get first tag in current development iteration
+        id: fetch-tag
+        if: contains(steps.last-release.outputs.full-tag , '-ea.')
+        run: |
+          echo "oldest-tag=$(git for-each-ref --sort=creatordate --format '%(refname:lstrip=2)' refs/tags | grep ${{ steps.last-release.outputs.base-tag }} | head -n 1)" >> "$GITHUB_OUTPUT"
+
+      - name: Update package with new version
+        id: bump
+        run: |
+          echo "version=$(npm version ${{ inputs.version_type }} --no-git-tag-version )" >> "$GITHUB_OUTPUT"
+
+      - name: Install project modules
+        run: npm ci
+
+      - name: Compile project
+        run: npm run compile
+
+      - name: Publish package
+        env:
+          NPM_CONFIG_PROVENANCE: true
+        run: npm publish
+
+      - name: Commit and push package modifications
+        run: |
+          git add package.json
+          git add package-lock.json
+          git commit -m "build: updated package with ${{ steps.bump.outputs.version }} [skip ci]"
+          git push
+
+      - name: Create and push new tag
+        run: |
+          git tag ${{ steps.bump.outputs.version }} -m "${{ steps.bump.outputs.version }}"
+          git push origin ${{ steps.bump.outputs.version }}
+
+      - name: Create release notes
+        uses: actions/github-script@v6
+        id: release-notes
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const repo_name = context.payload.repository.full_name
+            const response = await github.request('POST /repos/' + repo_name + '/releases/generate-notes', {
+              tag_name: '${{ steps.bump.outputs.version }}',
+              previous_tag_name: '${{ steps.fetch-tag.outputs.oldest-tag != ''  && steps.fetch-tag.outputs.oldest-tag  || steps.last-release.outputs.base-tag }}'
+            })
+            return response.data.body
+
+      - name: Create a release
+        uses: actions/github-script@v6.4.1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const repo_name = context.payload.repository.full_name
+            const response = await github.request('POST /repos/' + repo_name + '/releases', {
+              tag_name: '${{ steps.bump.outputs.version }}',
+              name: '${{ steps.bump.outputs.version }}',
+              draft: false,
+              body: ${{ steps.release-notes.outputs.result }},
+              prerelease: false,
+              make_latest: 'true'
+            })
diff --git a/.github/workflows/publish-switch.yml b/.github/workflows/publish-switch.yml
new file mode 100644
index 0000000..24dc215
--- /dev/null
+++ b/.github/workflows/publish-switch.yml
@@ -0,0 +1,34 @@
+# yaml-language-server: $schema=https://www.schemastore.org/github-workflow.json
+---
+name: Publish Switch
+
+on:
+  workflow_call:
+    inputs:
+      ref:
+        description: 'Git ref to publish'
+        required: true
+        type: string
+      is_prerelease:
+        description: 'Whether to publish as prerelease'
+        required: true
+        type: boolean
+      version_type:
+        description: 'Type of version bump (patch/minor/major/prerelease)'
+        required: false
+        type: string
+        default: 'prerelease'
+
+jobs:
+  prerelease:
+    if: inputs.is_prerelease == true || inputs.is_prerelease == 'true'
+    uses: ./.github/workflows/publish-prerelease.yml
+    with:
+      ref: ${{ inputs.ref || github.ref }}
+
+  release:
+    if: inputs.is_prerelease == false || inputs.is_prerelease == 'false'
+    uses: ./.github/workflows/publish-release.yml
+    with:
+      ref: ${{ inputs.ref || github.ref }}
+      version_type: ${{ inputs.version_type || 'patch' }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 03bae7f..d74886e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,13 +3,6 @@
 name: Release
 
 on:
-  workflow_call:
-    inputs:
-      version_type:
-        description: 'Type of version bump'
-        required: true
-        type: string
-
   workflow_dispatch:
     inputs:
       version_type:
@@ -22,116 +15,10 @@ on:
           - minor
           - major
 
-permissions:
-  contents: write
-  id-token: write
-
 jobs:
-  release:
-    runs-on: ubuntu-latest
-    environment: staging
-    name: Release the project
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Install node 20
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: npm
-          registry-url: 'https://registry.npmjs.org'
-
-      - name: Update npm
-        run: npm install -g npm@11.5.1
-
-      - name: Configure git
-        run: |
-          git config user.name "${{ github.actor }}"
-          git config user.email "${{ github.actor }}@users.noreply.github.com"
-
-      - name: get previous released annotated tag
-        id: last-release
-        run: |
-          echo "base-tag=$(git describe | awk -F '-' '{print $1}')" >> "$GITHUB_OUTPUT"
-          echo "full-tag=$(git describe)" >> "$GITHUB_OUTPUT"
-
-      - name: get first tag in current development iteration according to base
-        id: fetch-tag
-        if: ${{ contains(steps.last-release.outputs.full-tag , '-ea.') }}
-        run: |
-          echo "oldest-tag=$(git for-each-ref --sort=creatordate --format '%(refname:lstrip=2)' refs/tags | grep ${{ steps.last-release.outputs.base-tag }} | head -n 1)" >> "$GITHUB_OUTPUT"
-
-      - name: determine semver component to bump
-        id: bump-decision
-        run: |
-          echo "bump-part=${{ inputs.version_type }}" >> "$GITHUB_OUTPUT"
-
-      - name: Update package with new version
-        id: bump
-        run: |
-          if [[ "${{ inputs.version_type }}" == "prerelease" ]]; then
-            echo "version=$(npm version prerelease --no-git-tag-version --preid ea)" >> "$GITHUB_OUTPUT"
-          else
-            echo "version=$(npm version ${{ steps.bump-decision.outputs.bump-part }} --no-git-tag-version )" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: Install project modules
-        run: npm ci
-
-      - name: Compile project
-        run: npm run compile
-
-      - name: Publish package
-        run: npm publish --access public --provenance ${{ inputs.version_type == 'prerelease' && '--tag prerelease' || '' }}
-
-      - name: Commit and push package modifications
-        run: |
-          git add package.json
-          git add package-lock.json
-          git commit -m "build: updated package with ${{ steps.bump.outputs.version }} [skip ci]"
-          git push
-
-      - name: Create and push new tag
-        run: |
-          git tag ${{ steps.bump.outputs.version }} -m "${{ steps.bump.outputs.version }}"
-          git push origin ${{ steps.bump.outputs.version }}
-
-      - name: Create release notes for ${{ steps.bump.outputs.version }} release
-        if: inputs.version_type != 'prerelease'
-        uses: actions/github-script@v6
-        id: release-notes
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const repo_name = context.payload.repository.full_name
-            const response = await github.request('POST /repos/' + repo_name + '/releases/generate-notes', {
-              tag_name: '${{ steps.bump.outputs.version }}',
-              previous_tag_name: '${{ steps.fetch-tag.outputs.oldest-tag != ''  && steps.fetch-tag.outputs.oldest-tag  || steps.last-release.outputs.base-tag }}'
-            })
-            return response.data.body
-
-      - name: Create a release
-        uses: actions/github-script@v6.4.1
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const repo_name = context.payload.repository.full_name
-            const isPrerelease = '${{ inputs.version_type }}' === 'prerelease';
-            const releaseConfig = {
-              tag_name: '${{ steps.bump.outputs.version }}',
-              name: '${{ steps.bump.outputs.version }}',
-              prerelease: isPrerelease
-            };
-
-            if (isPrerelease) {
-              releaseConfig.generate_release_notes = true;
-            } else {
-              releaseConfig.draft = false;
-              releaseConfig.body = ${{ steps.release-notes.outputs.result }};
-              releaseConfig.make_latest = 'true';
-            }
-
-            const response = await github.request('POST /repos/' + repo_name + '/releases', releaseConfig);
+  publish-release:
+    uses: ./.github/workflows/publish-switch.yml
+    with:
+      ref: ${{ github.ref }}
+      is_prerelease: false
+      version_type: ${{ inputs.version_type }}
diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml
index 41feaa2..2289c1c 100644
--- a/.github/workflows/stage.yml
+++ b/.github/workflows/stage.yml
@@ -121,6 +121,8 @@ jobs:
 
   publish-prerelease:
     needs: test
-    uses: ./.github/workflows/release.yml
+    uses: ./.github/workflows/publish-switch.yml
     with:
+      ref: ${{ github.sha }}
+      is_prerelease: true
       version_type: prerelease