diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml
index 248a176..ac79573 100644
--- a/.github/workflows/publish-packages.yml
+++ b/.github/workflows/publish-packages.yml
@@ -48,6 +48,9 @@ jobs:
           node-version: '22'
           registry-url: 'https://registry.npmjs.org'
 
+      - name: Install npm with trusted publishing support
+        run: npm install --global npm@11.8.0
+
       - run: bun install
 
       - name: Determine target
@@ -106,8 +109,6 @@ jobs:
           else
             npm publish --access public
           fi
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: Publish @graspful/mcp
         if: (steps.target.outputs.target == 'all' || steps.target.outputs.target == 'mcp') && github.event.inputs.dry_run != 'true'
@@ -119,8 +120,6 @@ jobs:
           else
             npm publish --access public
           fi
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: Dry run — CLI
         if: (steps.target.outputs.target == 'all' || steps.target.outputs.target == 'cli') && github.event.inputs.dry_run == 'true'
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 31ce850..1888437 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -5,12 +5,12 @@
   "keywords": ["course", "learning", "adaptive", "mcp", "mcp-server", "ai", "ai-agent", "agent", "cli", "education", "edtech", "knowledge-graph", "spaced-repetition", "course-creation", "yaml", "adaptive-learning", "lms"],
   "repository": {
     "type": "git",
-    "url": "https://github.com/willwearing/graspful.git",
+    "url": "git+https://github.com/willwearing/graspful.git",
     "directory": "packages/cli"
   },
   "homepage": "https://graspful.ai",
   "bin": {
-    "graspful": "./dist/index.js"
+    "graspful": "dist/index.js"
   },
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
diff --git a/packages/mcp/package.json b/packages/mcp/package.json
index 38a4b4a..ec219d4 100644
--- a/packages/mcp/package.json
+++ b/packages/mcp/package.json
@@ -5,12 +5,12 @@
   "keywords": ["mcp", "mcp-server", "graspful", "course", "course-creation", "adaptive-learning", "ai-agent", "knowledge-graph", "spaced-repetition", "edtech", "education", "yaml", "lms", "model-context-protocol"],
   "repository": {
     "type": "git",
-    "url": "https://github.com/willwearing/graspful.git",
+    "url": "git+https://github.com/willwearing/graspful.git",
     "directory": "packages/mcp"
   },
   "homepage": "https://graspful.ai",
   "bin": {
-    "graspful-mcp": "./dist/index.js"
+    "graspful-mcp": "dist/index.js"
   },
   "main": "./dist/index.js",
   "files": ["dist"],