diff --git a/.github/workflows/publish-new-version.yaml b/.github/workflows/publish-new-version.yaml
index 9e92500482e..d29ce54517f 100644
--- a/.github/workflows/publish-new-version.yaml
+++ b/.github/workflows/publish-new-version.yaml
@@ -6,12 +6,23 @@ concurrency:
 
 permissions:
   contents: write
+  id-token: write  
 
 on:
   workflow_dispatch:
     inputs:
       version:
         description: What version number would you like to use? The version number should be **without** a leading `v`, e.g. `5.7.1` or `6.2.4`.
+      bump-main:
+        description: Should we bump the package.json main version?
+        required: true
+        type: boolean
+        default: true
+      update-version-function:
+        description: Should we update the version function to use this version?
+        required: true
+        type: boolean
+        default: true
 
 jobs:
   build:
@@ -27,10 +38,10 @@ jobs:
           fetch-depth: 0
           token: ${{ secrets.GH_PUSH_TOKEN }}
       - name: Set up git-cliff
-        uses: kenji-miyake/setup-git-cliff@v1
+        uses: kenji-miyake/setup-git-cliff@v2
       - name: setup git config
         run: |
-          git config user.name "GitHub Actions Bot"
+          git config user.name "Github Actions Bot"
           git config user.email "<>"
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
@@ -59,3 +70,48 @@ jobs:
           git push --tags
         env:
           CI: true
+
+  update-main-version:
+    needs: build
+    if: ${{ github.event.inputs.bump-main == 'true' }}
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+
+    steps:
+      - name: checkout main branch
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          fetch-depth: 0
+          token: ${{ secrets.GH_PUSH_TOKEN }}
+      - name: setup git config
+        run: |
+          git config user.name "GitHub Actions Bot"
+          git config user.email "<>"
+      - name: upgrade package version
+        run: |
+          jq --arg version "${{ github.event.inputs.version }}+main" '.version=$version' package.json > package.json.tmp
+          mv package.json.tmp package.json
+          git add package.json
+          git commit -m "chore: bump version to ${{ github.event.inputs.version }}+main"
+          git push origin main
+
+  update-version-checker:
+    needs: build
+    if: ${{ github.event.inputs.update-version-function == 'true' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Authenticate Google IAM
+        uses: 'google-github-actions/auth@v2'
+        with:
+          workload_identity_provider: 'projects/340004706233/locations/global/workloadIdentityPools/gh-actions-pool/providers/github-actions-oidc-unleash'
+          service_account: 'versionUpdateSa@metrics-304612.iam.gserviceaccount.com'
+          token_format: 'access_token'
+      - name: Update version checker
+        uses: 'Unleash/update-version-action@v0'
+        with:
+          version: ${{ github.event.inputs.version }}
+          distribution: 'oss'
diff --git a/.github/workflows/update_version_for_version_checker.yml b/.github/workflows/update_version_for_version_checker.yml
index 05175f6c2c7..c512418da8d 100644
--- a/.github/workflows/update_version_for_version_checker.yml
+++ b/.github/workflows/update_version_for_version_checker.yml
@@ -25,12 +25,6 @@ jobs:
           workload_identity_provider: 'projects/340004706233/locations/global/workloadIdentityPools/gh-actions-pool/providers/github-actions-oidc-unleash'
           service_account: 'versionUpdateSa@metrics-304612.iam.gserviceaccount.com'
           token_format: 'access_token'
-      - name: Update version
-        if: ${{ github.event_name == 'release' }}
-        uses: 'Unleash/update-version-action@v0'
-        with:
-          version: ${{ github.event.release.tag_name }}
-          distribution: 'oss'
       - name: Update version from manual dispatch
         if: ${{ inputs.version != '' }}
         uses: 'Unleash/update-version-action@v0'
diff --git a/package.json b/package.json
index 8e737ff447a..02c15619466 100644
--- a/package.json
+++ b/package.json
@@ -82,9 +82,7 @@
     "testTimeout": 10000,
     "globalSetup": "./scripts/jest-setup.js",
     "transform": {
-      "^.+\\.tsx?$": [
-        "@swc/jest"
-      ]
+      "^.+\\.tsx?$": ["@swc/jest"]
     },
     "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
     "testPathIgnorePatterns": [
@@ -93,13 +91,7 @@
       "/frontend/",
       "/website/"
     ],
-    "moduleFileExtensions": [
-      "ts",
-      "tsx",
-      "js",
-      "jsx",
-      "json"
-    ],
+    "moduleFileExtensions": ["ts", "tsx", "js", "jsx", "json"],
     "coveragePathIgnorePatterns": [
       "/node_modules/",
       "/dist/",
@@ -237,14 +229,8 @@
     "tough-cookie": "4.1.3"
   },
   "lint-staged": {
-    "*.{js,ts}": [
-      "biome check --apply --no-errors-on-unmatched"
-    ],
-    "*.{jsx,tsx}": [
-      "biome check --apply --no-errors-on-unmatched"
-    ],
-    "*.json": [
-      "biome format --write --no-errors-on-unmatched"
-    ]
+    "*.{js,ts}": ["biome check --apply --no-errors-on-unmatched"],
+    "*.{jsx,tsx}": ["biome check --apply --no-errors-on-unmatched"],
+    "*.json": ["biome format --write --no-errors-on-unmatched"]
   }
 }