diff --git a/.changeset/config.json b/.changeset/config.json
index 115f54fefee..df06fd79a42 100644
--- a/.changeset/config.json
+++ b/.changeset/config.json
@@ -3,13 +3,13 @@
   "changelog": [
     "@remix-run/changelog-github",
     {
-      "repo": "triggerdotdev/trigger.dev"
+      "repo": "BasicBlock/trigger.dev"
     }
   ],
   "commit": false,
-  "fixed": [["@trigger.dev/*", "trigger.dev"]],
+  "fixed": [["@trigger.dev/*", "@basicblock/trigger-cli"]],
   "linked": [],
-  "access": "public",
+  "access": "restricted",
   "baseBranch": "main",
   "updateInternalDependencies": "patch",
   "ignore": [
diff --git a/.changeset/fix-dead-process-execute-hang.md b/.changeset/fix-dead-process-execute-hang.md
index fa96e9c88c3..acae064b2ee 100644
--- a/.changeset/fix-dead-process-execute-hang.md
+++ b/.changeset/fix-dead-process-execute-hang.md
@@ -1,5 +1,5 @@
 ---
-"trigger.dev": patch
+"/trigger-cli": patch
 ---
 
 Fix runner getting stuck indefinitely when `execute()` is called on a dead child process.
diff --git a/.changeset/mcp-wait-timeout.md b/.changeset/mcp-wait-timeout.md
index 02d6c982316..fd8e810d11e 100644
--- a/.changeset/mcp-wait-timeout.md
+++ b/.changeset/mcp-wait-timeout.md
@@ -1,5 +1,5 @@
 ---
-"trigger.dev": patch
+"/trigger-cli": patch
 ---
 
 Add optional `timeoutInSeconds` parameter to the `wait_for_run_to_complete` MCP tool. Defaults to 60 seconds. If the run doesn't complete within the timeout, the current state of the run is returned instead of waiting indefinitely.
diff --git a/.github/workflows/changesets-pr.yml b/.github/workflows/changesets-pr.yml
index e2fdc187614..c6113c3d3fc 100644
--- a/.github/workflows/changesets-pr.yml
+++ b/.github/workflows/changesets-pr.yml
@@ -21,7 +21,7 @@ jobs:
     permissions:
       contents: write
       pull-requests: write
-    if: github.repository == 'triggerdotdev/trigger.dev'
+    if: github.repository == 'BasicBlock/trigger.dev'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 9518ca6157c..b5e788b4c6e 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -39,16 +39,16 @@ jobs:
           node-version: 20.20.0
 
       - name: 📥 Download deps
-        run: pnpm install --frozen-lockfile --filter trigger.dev...
+        run: pnpm install --frozen-lockfile --filter @basicblock/trigger-cli...
 
       - name: 📀 Generate Prisma Client
         run: pnpm run generate
 
       - name: 🔧 Build v3 cli monorepo dependencies
-        run: pnpm run build --filter trigger.dev^...
+        run: pnpm run build --filter @basicblock/trigger-cli^...
 
       - name: 🔧 Build worker template files
-        run: pnpm --filter trigger.dev run build:workers
+        run: pnpm --filter @basicblock/trigger-cli run build:workers
 
       - name: Enable corepack
         run: corepack enable
@@ -56,4 +56,4 @@ jobs:
       - name: Run E2E Tests
         shell: bash
         run: |
-          LOG=debug PM=${{ matrix.package-manager }} pnpm --filter trigger.dev run test:e2e
+          LOG=debug PM=${{ matrix.package-manager }} pnpm --filter @basicblock/trigger-cli run test:e2e
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3b4135ec099..922e8b43f34 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,7 +34,7 @@ jobs:
     name: 📋 Release Summary
     runs-on: ubuntu-latest
     if: |
-      github.repository == 'triggerdotdev/trigger.dev' &&
+      github.repository == 'BasicBlock/trigger.dev' &&
       github.event_name == 'pull_request' &&
       github.event.pull_request.merged == true &&
       github.event.pull_request.head.ref == 'changeset-release/main'
@@ -52,9 +52,8 @@ jobs:
     permissions:
       contents: write
       packages: write
-      id-token: write
     if: |
-      github.repository == 'triggerdotdev/trigger.dev' &&
+      github.repository == 'BasicBlock/trigger.dev' &&
       (
         (github.event_name == 'workflow_dispatch' && github.event.inputs.type == 'release') ||
         (github.event_name == 'pull_request' && github.event.pull_request.merged == true && github.event.pull_request.head.ref == 'changeset-release/main')
@@ -89,10 +88,15 @@ jobs:
           node-version: 20.20.0
           cache: "pnpm"
 
-      # npm v11.5.1 or newer is required for OIDC support
-      # https://github.blog/changelog/2025-07-31-npm-trusted-publishing-with-oidc-is-generally-available/#whats-new
-      - name: Setup npm 11.x for OIDC
-        run: npm install -g npm@11.6.4
+      - name: Configure npm for GitHub Packages
+        run: |
+          cat <<EOF > ~/.npmrc
+          @trigger.dev:registry=https://npm.pkg.github.com
+          @basicblock:registry=https://npm.pkg.github.com
+          //npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}
+          EOF
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
@@ -101,10 +105,10 @@ jobs:
         run: pnpm run generate
 
       - name: Build
-        run: pnpm run build --filter "@trigger.dev/*" --filter "trigger.dev"
+        run: pnpm run build --filter "@trigger.dev/*" --filter "@basicblock/trigger-cli"
 
       - name: Type check
-        run: pnpm run typecheck --filter "@trigger.dev/*" --filter "trigger.dev"
+        run: pnpm run typecheck --filter "@trigger.dev/*" --filter "@basicblock/trigger-cli"
 
       - name: Publish
         id: changesets
@@ -114,6 +118,7 @@ jobs:
           createGithubReleases: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Show package version
         if: steps.changesets.outputs.published == 'true'
@@ -147,8 +152,8 @@ jobs:
     environment: npm-publish
     permissions:
       contents: read
-      id-token: write
-    if: github.repository == 'triggerdotdev/trigger.dev' && github.event_name == 'workflow_dispatch' && github.event.inputs.type == 'prerelease'
+      packages: write
+    if: github.repository == 'BasicBlock/trigger.dev' && github.event_name == 'workflow_dispatch' && github.event.inputs.type == 'prerelease'
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -167,10 +172,15 @@ jobs:
           node-version: 20.20.0
           cache: "pnpm"
 
-      # npm v11.5.1 or newer is required for OIDC support
-      # https://github.blog/changelog/2025-07-31-npm-trusted-publishing-with-oidc-is-generally-available/#whats-new
-      - name: Setup npm 11.x for OIDC
-        run: npm install -g npm@11.6.4
+      - name: Configure npm for GitHub Packages
+        run: |
+          cat <<EOF > ~/.npmrc
+          @trigger.dev:registry=https://npm.pkg.github.com
+          @basicblock:registry=https://npm.pkg.github.com
+          //npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}
+          EOF
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Download deps
         run: pnpm install --frozen-lockfile
@@ -184,12 +194,13 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Clean
-        run: pnpm run clean --filter "@trigger.dev/*" --filter "trigger.dev"
+        run: pnpm run clean --filter "@trigger.dev/*" --filter "@basicblock/trigger-cli"
 
       - name: Build
-        run: pnpm run build --filter "@trigger.dev/*" --filter "trigger.dev"
+        run: pnpm run build --filter "@trigger.dev/*" --filter "@basicblock/trigger-cli"
 
       - name: Publish prerelease
         run: pnpm exec changeset publish --no-git-tag --snapshot --tag ${{ github.event.inputs.prerelease_tag }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/package.json b/package.json
index 6420ec29935..8ef2496e32c 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "env:pull": "turbo run env:pull",
     "changeset:add": "changeset",
     "changeset:version": "changeset version",
-    "changeset:release": "pnpm run build --filter \"@trigger.dev/*\" --filter \"trigger.dev\" && changeset publish",
+    "changeset:release": "pnpm run build --filter \"@trigger.dev/*\" --filter \"@basicblock/trigger-cli\" && changeset publish",
     "changeset:v4": "changeset pre enter v4",
     "changeset:normal": "changeset pre exit",
     "clean:sourcemaps": "turbo run clean:sourcemaps",
@@ -118,4 +118,4 @@
       "turbo"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/packages/build/package.json b/packages/build/package.json
index bd2c09034b0..5cee6c97a1a 100644
--- a/packages/build/package.json
+++ b/packages/build/package.json
@@ -4,11 +4,12 @@
   "description": "trigger.dev build extensions",
   "license": "MIT",
   "publishConfig": {
-    "access": "public"
+    "access": "restricted",
+    "registry": "https://npm.pkg.github.com"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/triggerdotdev/trigger.dev",
+    "url": "https://github.com/BasicBlock/trigger.dev",
     "directory": "packages/build"
   },
   "type": "module",
diff --git a/packages/cli-v3/package.json b/packages/cli-v3/package.json
index 838593006fe..6e1c0dd46aa 100644
--- a/packages/cli-v3/package.json
+++ b/packages/cli-v3/package.json
@@ -1,21 +1,22 @@
 {
-  "name": "trigger.dev",
+  "name": "@basicblock/trigger-cli",
   "version": "4.3.3",
   "description": "A Command-Line Interface for Trigger.dev projects",
   "type": "module",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/triggerdotdev/trigger.dev",
+    "url": "https://github.com/BasicBlock/trigger.dev",
     "directory": "packages/cli-v3"
   },
   "publishConfig": {
-    "access": "public"
+    "access": "restricted",
+    "registry": "https://npm.pkg.github.com"
   },
-  "mcpName": "io.github.triggerdotdev/trigger.dev",
+  "mcpName": "io.github.basicblock/trigger-cli",
   "keywords": [
     "typescript",
-    "trigger.dev",
+    "@basicblock/trigger-cli",
     "workflows",
     "orchestration",
     "events",
diff --git a/packages/core/package.json b/packages/core/package.json
index d73b425f7d4..336e75bfe1c 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -4,11 +4,12 @@
   "description": "Core code used across the Trigger.dev SDK and platform",
   "license": "MIT",
   "publishConfig": {
-    "access": "public"
+    "access": "restricted",
+    "registry": "https://npm.pkg.github.com"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/triggerdotdev/trigger.dev",
+    "url": "https://github.com/BasicBlock/trigger.dev",
     "directory": "packages/core"
   },
   "files": [
diff --git a/packages/python/package.json b/packages/python/package.json
index f732db7c966..be79b13100c 100644
--- a/packages/python/package.json
+++ b/packages/python/package.json
@@ -4,11 +4,12 @@
   "description": "Python runtime and build extension for Trigger.dev",
   "license": "MIT",
   "publishConfig": {
-    "access": "public"
+    "access": "restricted",
+    "registry": "https://npm.pkg.github.com"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/triggerdotdev/trigger.dev",
+    "url": "https://github.com/BasicBlock/trigger.dev",
     "directory": "packages/python"
   },
   "type": "module",
diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json
index ea73d20eada..11bd505f226 100644
--- a/packages/react-hooks/package.json
+++ b/packages/react-hooks/package.json
@@ -4,11 +4,12 @@
   "description": "trigger.dev react hooks",
   "license": "MIT",
   "publishConfig": {
-    "access": "public"
+    "access": "restricted",
+    "registry": "https://npm.pkg.github.com"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/triggerdotdev/trigger.dev",
+    "url": "https://github.com/BasicBlock/trigger.dev",
     "directory": "packages/react-hooks"
   },
   "type": "module",
diff --git a/packages/redis-worker/package.json b/packages/redis-worker/package.json
index 97f83108083..f53c754ae16 100644
--- a/packages/redis-worker/package.json
+++ b/packages/redis-worker/package.json
@@ -4,11 +4,12 @@
   "description": "Redis worker for trigger.dev",
   "license": "MIT",
   "publishConfig": {
-    "access": "public"
+    "access": "restricted",
+    "registry": "https://npm.pkg.github.com"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/triggerdotdev/trigger.dev",
+    "url": "https://github.com/BasicBlock/trigger.dev",
     "directory": "packages/redis-worker"
   },
   "type": "module",
diff --git a/packages/rsc/package.json b/packages/rsc/package.json
index 4107c03c955..d322add3d25 100644
--- a/packages/rsc/package.json
+++ b/packages/rsc/package.json
@@ -4,11 +4,12 @@
   "description": "trigger.dev rsc",
   "license": "MIT",
   "publishConfig": {
-    "access": "public"
+    "access": "restricted",
+    "registry": "https://npm.pkg.github.com"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/triggerdotdev/trigger.dev",
+    "url": "https://github.com/BasicBlock/trigger.dev",
     "directory": "packages/rsc"
   },
   "type": "module",
diff --git a/packages/schema-to-json/package.json b/packages/schema-to-json/package.json
index 23ae1c5f6c3..1ac5ffec97d 100644
--- a/packages/schema-to-json/package.json
+++ b/packages/schema-to-json/package.json
@@ -4,11 +4,12 @@
   "description": "Convert various schema validation libraries to JSON Schema",
   "license": "MIT",
   "publishConfig": {
-    "access": "public"
+    "access": "restricted",
+    "registry": "https://npm.pkg.github.com"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/triggerdotdev/trigger.dev",
+    "url": "https://github.com/BasicBlock/trigger.dev",
     "directory": "packages/schema-to-json"
   },
   "type": "module",
diff --git a/packages/trigger-sdk/package.json b/packages/trigger-sdk/package.json
index 9ee58f6598a..0a8a9ef2efa 100644
--- a/packages/trigger-sdk/package.json
+++ b/packages/trigger-sdk/package.json
@@ -4,11 +4,12 @@
   "description": "trigger.dev Node.JS SDK",
   "license": "MIT",
   "publishConfig": {
-    "access": "public"
+    "access": "restricted",
+    "registry": "https://npm.pkg.github.com"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/triggerdotdev/trigger.dev",
+    "url": "https://github.com/BasicBlock/trigger.dev",
     "directory": "packages/trigger-sdk"
   },
   "type": "module",
diff --git a/scripts/publish-prerelease.sh b/scripts/publish-prerelease.sh
index cadcd65aad2..ddb35fc29a4 100755
--- a/scripts/publish-prerelease.sh
+++ b/scripts/publish-prerelease.sh
@@ -41,11 +41,11 @@ fi
 
 read -e -p "Pausing for manual changes, press Enter when ready to continue..."
 
-echo "Running: pnpm run clean --filter \"@trigger.dev/*\" --filter \"trigger.dev\""
-pnpm run clean --filter "@trigger.dev/*" --filter "trigger.dev"
+echo "Running: pnpm run clean --filter \"@trigger.dev/*\" --filter \"@basicblock/trigger-cli\""
+pnpm run clean --filter "@trigger.dev/*" --filter "@basicblock/trigger-cli"
 
-echo "Running: pnpm run build --filter \"@trigger.dev/*\" --filter \"trigger.dev\""
-pnpm run build --filter "@trigger.dev/*" --filter "trigger.dev"
+echo "Running: pnpm run build --filter \"@trigger.dev/*\" --filter \"@basicblock/trigger-cli\""
+pnpm run build --filter "@trigger.dev/*" --filter "@basicblock/trigger-cli"
 
 echo "Going to run: pnpm exec changeset publish --no-git-tag --snapshot --tag $version"
 read -p "Do you wish to continue? (y/N): " prompt