diff --git a/.github/actions/build-electron/action.yml b/.github/actions/build-electron/action.yml
index 74c335951..9e5b1670b 100644
--- a/.github/actions/build-electron/action.yml
+++ b/.github/actions/build-electron/action.yml
@@ -86,7 +86,7 @@ runs:
       APPLE_ID_PASSWORD: ${{ env.APPLE_ID_PASSWORD }}
       WINDOWS_SIGN_EXECUTABLE: ${{ env.WINDOWS_SIGN_EXECUTABLE }}
       TRILIUM_ARTIFACT_NAME_HINT: TriliumNextNotes-${{ github.ref_name }}-${{ inputs.os }}-${{ inputs.arch }}
-    run: pnpm nx --project=@triliumnext/desktop electron-forge:make -- --arch=${{ inputs.arch }} --platform=${{ inputs.forge_platform }}
+    run: pnpm nx --project=desktop electron-forge:make -- --arch=${{ inputs.arch }} --platform=${{ inputs.forge_platform }}
 
   # Add DMG signing step
   - name: Sign DMG
diff --git a/.github/actions/build-server/action.yml b/.github/actions/build-server/action.yml
index 7d4fc0101..c3c6288bc 100644
--- a/.github/actions/build-server/action.yml
+++ b/.github/actions/build-server/action.yml
@@ -23,7 +23,7 @@ runs:
     shell: bash
     run: |
       pnpm run chore:update-build-info
-      pnpm nx --project=@triliumnext/server package
+      pnpm nx --project=server package
   - name: Prepare artifacts
     shell: bash
     run: |
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 06a817cda..363eb5783 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -115,7 +115,7 @@ jobs:
       - name: Update build info
         run: pnpm run chore:update-build-info
       - name: Trigger build
-        run: pnpm nx run @triliumnext/server:build
+        run: pnpm nx run server:build
       - uses: docker/setup-buildx-action@v3
       - uses: docker/build-push-action@v6
         with:
@@ -143,7 +143,7 @@ jobs:
       - name: Update build info
         run: pnpm run chore:update-build-info
       - name: Trigger build
-        run: pnpm nx run @triliumnext/server:build
+        run: pnpm nx run server:build
 
       - name: Set IMAGE_NAME to lowercase
         run: echo "IMAGE_NAME=${IMAGE_NAME,,}" >> $GITHUB_ENV
diff --git a/.github/workflows/main-docker.yml b/.github/workflows/main-docker.yml
index d6e1fece8..b13fd9ffc 100644
--- a/.github/workflows/main-docker.yml
+++ b/.github/workflows/main-docker.yml
@@ -56,7 +56,7 @@ jobs:
         run: npx playwright install --with-deps
 
       - name: Run the TypeScript build
-        run: npm nx run @triliumnext/server:build
+        run: npm nx run server:build
 
       - name: Build and export to Docker
         uses: docker/build-push-action@v6
diff --git a/apps/client/package.json b/apps/client/package.json
index 1868fd638..1abafc994 100644
--- a/apps/client/package.json
+++ b/apps/client/package.json
@@ -59,5 +59,8 @@
     "@types/react-dom": "18.3.6",
     "happy-dom": "17.4.4",
     "script-loader": "0.7.2"
+  },
+  "nx": {
+    "name": "client"
   }
 }
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 40f051ac7..798fb49bf 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -45,6 +45,7 @@
   },
   "description": "Build your personal knowledge base with TriliumNext Notes",
   "nx": {
+    "name": "desktop",
     "targets": {
       "postbuild": {
         "executor": "nx:run-commands",
diff --git a/apps/edit-docs/tsconfig.app.json b/apps/edit-docs/tsconfig.app.json
index d707ff203..832cf811d 100644
--- a/apps/edit-docs/tsconfig.app.json
+++ b/apps/edit-docs/tsconfig.app.json
@@ -17,9 +17,6 @@
     "eslint.config.mjs"
   ],
   "references": [
-    {
-      "path": "../server/tsconfig.app.json"
-    },
     {
       "path": "../desktop/tsconfig.app.json"
     },
diff --git a/apps/edit-docs/tsconfig.json b/apps/edit-docs/tsconfig.json
index de6607550..56baa3f4e 100644
--- a/apps/edit-docs/tsconfig.json
+++ b/apps/edit-docs/tsconfig.json
@@ -3,9 +3,6 @@
   "files": [],
   "include": [],
   "references": [
-    {
-      "path": "../server"
-    },
     {
       "path": "../desktop"
     },
diff --git a/apps/server-e2e/package.json b/apps/server-e2e/package.json
index 631bc2bf5..5e58a70e0 100644
--- a/apps/server-e2e/package.json
+++ b/apps/server-e2e/package.json
@@ -3,9 +3,10 @@
   "version": "0.0.1",
   "private": true,
   "nx": {
+    "name": "server-e2e",
     "implicitDependencies": [
-      "@triliumnext/client",
-      "@triliumnext/server"
+      "client",
+      "server"
     ]
   }
 }
diff --git a/apps/server/package.json b/apps/server/package.json
index dd39f5020..91aaeb659 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -124,8 +124,9 @@
     "copy-webpack-plugin": "13.0.0"
   },
   "nx": {
+    "name": "server",
     "implicitDependencies": [
-      "@triliumnext/client"
+      "client"
     ],
     "targets": {
       "serve": {
@@ -135,15 +136,15 @@
           "build"
         ],
         "options": {
-          "buildTarget": "@triliumnext/server:build",
+          "buildTarget": "server:build",
           "runBuildTargetDependencies": false
         },
         "configurations": {
           "development": {
-            "buildTarget": "@triliumnext/server:build:development"
+            "buildTarget": "server:build:development"
           },
           "production": {
-            "buildTarget": "@triliumnext/server:build:production"
+            "buildTarget": "server:build:production"
           }
         }
       },
diff --git a/package.json b/package.json
index 4c659cec3..2abe363ae 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "client:build": "nx build client",
     "server:build": "nx build server",
     "server:start": "nx run-many --target=serve --projects=client,server --parallel",
-    "server:start-prod": "nx run @triliumnext/server:start-prod",
+    "server:start-prod": "nx run server:start-prod",
     "electron:build": "nx build desktop",
     "chore:ci-update-nightly-version": "tsx ./scripts/update-nightly-version.ts",
     "chore:update-build-info": "tsx ./scripts/update-build-info.ts",
diff --git a/packages/commons/package.json b/packages/commons/package.json
index f3590e58c..a4635b3a0 100644
--- a/packages/commons/package.json
+++ b/packages/commons/package.json
@@ -23,6 +23,7 @@
     "url": "https://github.com/TriliumNext/Notes"
   },
   "nx": {
+    "name": "commons",
     "sourceRoot": "packages/commons/src",
     "targets": {
       "build": {
diff --git a/packages/turndown-plugin-gfm/package.json b/packages/turndown-plugin-gfm/package.json
index 59c0a1c2f..6834788b2 100644
--- a/packages/turndown-plugin-gfm/package.json
+++ b/packages/turndown-plugin-gfm/package.json
@@ -33,6 +33,7 @@
     "gfm"
   ],
   "nx": {
+    "name": "turndown-plugin-gfm",
     "sourceRoot": "packages/turndown-plugin-gfm/src",
     "targets": {
       "build": {