diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
new file mode 100644
index 0000000..5f8c0e7
--- /dev/null
+++ b/.github/actions/setup/action.yml
@@ -0,0 +1,24 @@
+name: Setup
+description: Perform standard setup and install dependencies using pnpm.
+inputs:
+  node-version:
+    description: The version of Node.js to install
+    required: true
+    default: 23.7.0
+  registry-url:
+    description: Optional registry to set up for auth
+
+runs:
+  using: composite
+  steps:
+    - name: Install pnpm
+      uses: pnpm/action-setup@v3
+    - name: Install node
+      uses: actions/setup-node@v4
+      with:
+        cache: pnpm
+        node-version: ${{ inputs.node-version }}
+        registry-url: ${{ inputs.registry-url }}
+    - name: Install dependencies
+      shell: bash
+      run: pnpm install
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f3c2ad8..34975ca 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -7,29 +7,27 @@ on:
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
 permissions: {}
 
 jobs:
   build:
+    if: github.repository_owner == 'Effect-Ts'
     runs-on: ubuntu-latest
     permissions:
       contents: write
       id-token: write
       pull-requests: write
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Install pnpm
-        uses: pnpm/action-setup@v3
-      - name: Install node
-        uses: actions/setup-node@v4
-        with:
-          cache: pnpm
-          node-version: 22.2.0
+      - uses: actions/checkout@v4
       - name: Install dependencies
-        shell: bash
-        run: pnpm install
+        uses: ./.github/actions/setup
+        with:
+          registry-url: "https://registry.npmjs.org"
+      - name: Upgrade npm for OIDC support
+        run: npm install -g npm@latest
       - name: Type check
         run: tsc --noEmit
       - run: pnpm build
@@ -41,4 +39,3 @@ jobs:
           publish: pnpm exec changeset publish
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 5b7491c..e3b9c87 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -8,24 +8,19 @@ on:
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
+permissions: {}
+
 jobs:
   build:
+    if: github.repository_owner == 'Effect-Ts'
     runs-on: ubuntu-latest
-
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Install pnpm
-        uses: pnpm/action-setup@v3
-      - name: Install node
-        uses: actions/setup-node@v4
-        with:
-          cache: pnpm
-          node-version: 22.2.0
+      - uses: actions/checkout@v4
       - name: Install dependencies
-        shell: bash
-        run: pnpm install
+        uses: ./.github/actions/setup
       - name: Type check
         run: tsc --noEmit
       - run: pnpm build