diff --git a/.github/workflows/webcomponents.yml b/.github/workflows/webcomponents.yml
index 862a1e0f7..0d9589c9a 100644
--- a/.github/workflows/webcomponents.yml
+++ b/.github/workflows/webcomponents.yml
@@ -5,7 +5,11 @@ run-name: 🧩 Build Web Components for ${{ github.event_name == 'issue_comment'
 on:
   push:
     branches:
-      - geocat
+      - main
+    tags:
+      - 'v*.*.*'
+  pull_request:
+    types: [opened, synchronize, ready_for_review]
   release:
     types: [published]
 
@@ -54,10 +58,10 @@ jobs:
           tag: ${{ github.ref }}
           overwrite: true
 
-      - name: Publish web component to ${{ env.PUBLISH_BRANCH }} branch
+      - name: Publish web component to ${{ env.PUBLISH_BRANCH }}-${{ github.ref_name }} branch
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           force_orphan: true
           publish_dir: ./wc-dist
-          publish_branch: ${{ env.PUBLISH_BRANCH }}
+          publish_branch: ${{ env.PUBLISH_BRANCH }}-${{ github.ref_name }}