diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 1d37734..80ac2cf 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -3,7 +3,7 @@ name: Publish
 on:
   push:
     tags:
-      - "*"
+      - "@webroute/*"
 
 jobs:
   publish:
@@ -16,20 +16,12 @@ jobs:
       - uses: pnpm/action-setup@v4
         with:
           version: 9.1.3
-      - name: Extract package name
-        run: |
-          TAG_NAME="${GITHUB_REF#refs/tags/}"
-
-          # Split the tag into two parts by the first slash
-          PKG_NAME="${TAG_NAME%%/*}"
-
-          # Set environment variables for subsequent steps
-          echo "PKG_NAME=$PKG_NAME" >> $GITHUB_ENV
-      - name: Install packages
-        run: pnpm i
-      - name: Build package
-        run: pnpm turbo build --filter $PKG_NAME...
-      - uses: JS-DevTools/npm-publish@v3
+      - name: Create Release Pull Request or Publish to npm
+        id: changesets
+        uses: changesets/action@v1
         with:
-          token: ${{ secrets.NPM_TOKEN }}
-          package: "packages/${{ env.PKG_NAME }}"
+          # This expects you to have a script called release which does a build for your packages and calls changeset publish
+          publish: pnpm release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/package.json b/package.json
index abf050d..f0ca6ae 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,8 @@
     "check": "turbo check",
     "format:pkg-json": "./scripts/common-pkg.mjs && syncpack format",
     "test": "CI=1 turbo test",
-    "clean": "rimraf -g \"./packages/**/dist\" \"./packages/**/node_modules\""
+    "clean": "rimraf -g \"./packages/**/dist\" \"./packages/**/node_modules\"",
+    "release": "pnpm build:packages && pnpm changeset publish"
   },
   "workspaces": [
     "docs",