diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0edcd72af5..a0fddec3e6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,9 +19,9 @@ commands:
       - checkout
       - restore_cache:
           keys:
-            - dependency-cache-v1-{{ checksum "package.json" }}
+            - dependency-cache-v2-{{ checksum "package.json" }}
             # if cache for exact version of 'package.json' is not present, then load the most recent cache
-            - dependency-cache-v1-
+            - dependency-cache-v2-
       - run: npm install
       - run:
           name: 'Compile in production mode'
@@ -40,7 +40,7 @@ commands:
       - store_artifacts:
           path: ./extensions
       - save_cache:
-          key: dependency-cache-v1-{{ checksum "package.json" }}
+          key: dependency-cache-v2-{{ checksum "package.json" }}
           paths:
             - node_modules
 
@@ -51,9 +51,9 @@ commands:
       - checkout
       - restore_cache:
           keys:
-            - dependency-cache-win2-{{ checksum "package.json" }}
+            - dependency-cache-win3-{{ checksum "package.json" }}
             # if cache for exact version of 'package.json' is not present, then load the most recent cache
-            - dependency-cache-win2-
+            - dependency-cache-win3-
       - run:
           name: 'Install node'
           shell: bash.exe
@@ -75,7 +75,7 @@ commands:
           shell: bash.exe
           command: npm run compile
       - save_cache:
-          key: dependency-cache-win2-{{ checksum "package.json" }}
+          key: dependency-cache-win3-{{ checksum "package.json" }}
           paths:
             - node_modules
       - run:
diff --git a/.npmrc b/.npmrc
deleted file mode 100644
index 6659b35b85..0000000000
--- a/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-registry=https://npm.lwcjs.org/
\ No newline at end of file
diff --git a/package.json b/package.json
index 7459e3f6cd..94548cdb70 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,8 @@
     "snyk:test": "lerna exec --bail=false --ignore salesforcedx-vscode -- snyk test --severity-threshold=medium --show-vulnerable-paths=false",
     "snyk:monitor": "lerna exec --bail=false --ignore salesforcedx-vscode -- snyk monitor --severity-threshold=medium --show-vulnerable-paths=false --org=vazexqi",
     "aggregateJUnit": "node scripts/aggregate-junit-xml.js",
-    "link-lsp": "lerna exec yarn link aura-language-server lwc-language-server lightning-lsp-common --scope salesforcedx-vscode-lightning && lerna exec yarn link lwc-language-server lightning-lsp-common --scope salesforcedx-vscode-lwc"
+    "link-lsp": "lerna exec yarn link @salesforce/aura-language-server @salesforce/lwc-language-server @salesforce/lightning-lsp-common --scope salesforcedx-vscode-lightning && lerna exec yarn link @salesforce/lwc-language-server @salesforce/lightning-lsp-common --scope salesforcedx-vscode-lwc",
+    "unlink-lsp": "lerna exec yarn unlink @salesforce/aura-language-server @salesforce/lwc-language-server @salesforce/lightning-lsp-common --scope salesforcedx-vscode-lightning && lerna exec yarn unlink @salesforce/lwc-language-server @salesforce/lightning-lsp-common --scope salesforcedx-vscode-lwc"
   },
   "repository": {
     "type": "git",
diff --git a/packages/salesforcedx-vscode-lightning/package.json b/packages/salesforcedx-vscode-lightning/package.json
index c374a06b96..38ce0370e5 100644
--- a/packages/salesforcedx-vscode-lightning/package.json
+++ b/packages/salesforcedx-vscode-lightning/package.json
@@ -25,10 +25,10 @@
   ],
   "dependencies": {
     "@salesforce/salesforcedx-utils-vscode": "47.17.1",
-    "aura-language-server": "2.2.7",
-    "lwc-language-server": "2.2.7",
+    "@salesforce/aura-language-server": "2.2.17",
+    "@salesforce/lwc-language-server": "2.2.17",
     "change-case": "^3.1.0",
-    "lightning-lsp-common": "2.2.7",
+    "@salesforce/lightning-lsp-common": "2.2.17",
     "open": "6.0.0",
     "vscode-extension-telemetry": "0.0.17",
     "vscode-languageclient": "^5.2.1",
diff --git a/packages/salesforcedx-vscode-lightning/src/index.ts b/packages/salesforcedx-vscode-lightning/src/index.ts
index 72bd3d38eb..a9ab3261f3 100644
--- a/packages/salesforcedx-vscode-lightning/src/index.ts
+++ b/packages/salesforcedx-vscode-lightning/src/index.ts
@@ -5,8 +5,8 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { shared as lspCommon } from 'lightning-lsp-common';
-import { WorkspaceType } from 'lightning-lsp-common/lib/shared';
+import { shared as lspCommon } from '@salesforce/lightning-lsp-common';
+import { WorkspaceType } from '@salesforce/lightning-lsp-common/lib/shared';
 import * as path from 'path';
 import {
   commands,
@@ -92,7 +92,13 @@ export async function activate(context: ExtensionContext) {
 
   // Setup the language server
   const serverModule = context.asAbsolutePath(
-    path.join('node_modules', 'aura-language-server', 'lib', 'server.js')
+    path.join(
+      'node_modules',
+      '@salesforce',
+      'aura-language-server',
+      'lib',
+      'server.js'
+    )
   );
 
   // The debug options for the server
diff --git a/packages/salesforcedx-vscode-lightning/src/views/component-tree-provider.ts b/packages/salesforcedx-vscode-lightning/src/views/component-tree-provider.ts
index 3fa2cda1c1..5bb9ac8e4a 100644
--- a/packages/salesforcedx-vscode-lightning/src/views/component-tree-provider.ts
+++ b/packages/salesforcedx-vscode-lightning/src/views/component-tree-provider.ts
@@ -4,9 +4,12 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
+import { AttributeInfo, TagInfo } from '@salesforce/lightning-lsp-common';
+import {
+  isUnknown,
+  WorkspaceType
+} from '@salesforce/lightning-lsp-common/lib/shared';
 import { paramCase } from 'change-case';
-import { AttributeInfo, TagInfo } from 'lightning-lsp-common';
-import { isUnknown, WorkspaceType } from 'lightning-lsp-common/lib/shared';
 import {
   commands,
   Event,
diff --git a/packages/salesforcedx-vscode-lightning/test/unit/package/packageDependencies.test.ts b/packages/salesforcedx-vscode-lightning/test/unit/package/packageDependencies.test.ts
index 61e249729c..c298ad3d25 100644
--- a/packages/salesforcedx-vscode-lightning/test/unit/package/packageDependencies.test.ts
+++ b/packages/salesforcedx-vscode-lightning/test/unit/package/packageDependencies.test.ts
@@ -3,9 +3,9 @@ import * as fs from 'fs';
 import * as path from 'path';
 
 const checkedPackagePatterns: RegExp[] = [
-  /lightning-lsp-common/i,
-  /aura-language-server/i,
-  /lwc-language-server/i,
+  /^@salesforce\/lightning-lsp-common/i,
+  /^@salesforce\/aura-language-server/i,
+  /^@salesforce\/lwc-language-server/i,
   /^@salesforce\/salesforcedx/i
 ];
 
diff --git a/packages/salesforcedx-vscode-lwc/package.json b/packages/salesforcedx-vscode-lwc/package.json
index f6ee497a2d..0347e684b1 100644
--- a/packages/salesforcedx-vscode-lwc/package.json
+++ b/packages/salesforcedx-vscode-lwc/package.json
@@ -30,8 +30,8 @@
     "eslint": "5.0.0",
     "jest-editor-support": "^26.0.0-beta",
     "jest-regex-util": "^24.9.0",
-    "lightning-lsp-common": "2.2.7",
-    "lwc-language-server": "2.2.7",
+    "@salesforce/lightning-lsp-common": "2.2.17",
+    "@salesforce/lwc-language-server": "2.2.17",
     "rxjs": "^5.4.1",
     "strip-ansi": "^5.2.0",
     "uuid": "^3.3.3",
diff --git a/packages/salesforcedx-vscode-lwc/src/commands/forceLightningLwcPreview.ts b/packages/salesforcedx-vscode-lwc/src/commands/forceLightningLwcPreview.ts
index 53f932ee92..06a1d29cd7 100644
--- a/packages/salesforcedx-vscode-lwc/src/commands/forceLightningLwcPreview.ts
+++ b/packages/salesforcedx-vscode-lwc/src/commands/forceLightningLwcPreview.ts
@@ -5,8 +5,8 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
+import { componentUtil } from '@salesforce/lightning-lsp-common';
 import * as fs from 'fs';
-import { componentUtil } from 'lightning-lsp-common';
 import * as vscode from 'vscode';
 import { nls } from '../messages';
 import { DevServerService } from '../service/devServerService';
diff --git a/packages/salesforcedx-vscode-lwc/src/index.ts b/packages/salesforcedx-vscode-lwc/src/index.ts
index 16bf70bf27..a48911245e 100644
--- a/packages/salesforcedx-vscode-lwc/src/index.ts
+++ b/packages/salesforcedx-vscode-lwc/src/index.ts
@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { shared as lspCommon } from 'lightning-lsp-common';
+import { shared as lspCommon } from '@salesforce/lightning-lsp-common';
 import * as path from 'path';
 import * as vscode from 'vscode';
 import {
@@ -148,7 +148,13 @@ function registerCommands(
 function startLWCLanguageServer(context: ExtensionContext) {
   // Setup the language server
   const serverModule = context.asAbsolutePath(
-    path.join('node_modules', 'lwc-language-server', 'lib', 'server.js')
+    path.join(
+      'node_modules',
+      '@salesforce',
+      'lwc-language-server',
+      'lib',
+      'server.js'
+    )
   );
   const debugOptions = { execArgv: ['--nolazy', '--inspect=6009'] };
   // If the extension is launched in debug mode then the debug server options are used
diff --git a/packages/salesforcedx-vscode-lwc/src/testSupport/testIndexer/lwcTestIndexer.ts b/packages/salesforcedx-vscode-lwc/src/testSupport/testIndexer/lwcTestIndexer.ts
index 789623e38c..ca997f5879 100644
--- a/packages/salesforcedx-vscode-lwc/src/testSupport/testIndexer/lwcTestIndexer.ts
+++ b/packages/salesforcedx-vscode-lwc/src/testSupport/testIndexer/lwcTestIndexer.ts
@@ -4,8 +4,8 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
+import { Indexer } from '@salesforce/lightning-lsp-common';
 import { parse } from 'jest-editor-support';
-import { Indexer } from 'lightning-lsp-common';
 import * as vscode from 'vscode';
 import {
   extractPositionFromFailureMessage,
diff --git a/packages/salesforcedx-vscode-lwc/test/unit/package/packageDependencies.test.ts b/packages/salesforcedx-vscode-lwc/test/unit/package/packageDependencies.test.ts
index 61e249729c..c298ad3d25 100644
--- a/packages/salesforcedx-vscode-lwc/test/unit/package/packageDependencies.test.ts
+++ b/packages/salesforcedx-vscode-lwc/test/unit/package/packageDependencies.test.ts
@@ -3,9 +3,9 @@ import * as fs from 'fs';
 import * as path from 'path';
 
 const checkedPackagePatterns: RegExp[] = [
-  /lightning-lsp-common/i,
-  /aura-language-server/i,
-  /lwc-language-server/i,
+  /^@salesforce\/lightning-lsp-common/i,
+  /^@salesforce\/aura-language-server/i,
+  /^@salesforce\/lwc-language-server/i,
   /^@salesforce\/salesforcedx/i
 ];
 
diff --git a/packages/salesforcedx-vscode-lwc/test/vscode-integration/activation/activationMode.test.ts b/packages/salesforcedx-vscode-lwc/test/vscode-integration/activation/activationMode.test.ts
index ff155a5c0e..3b3d56f02f 100644
--- a/packages/salesforcedx-vscode-lwc/test/vscode-integration/activation/activationMode.test.ts
+++ b/packages/salesforcedx-vscode-lwc/test/vscode-integration/activation/activationMode.test.ts
@@ -3,7 +3,7 @@ import { activate } from '../../../src/index';
 import * as vscode from 'vscode';
 import sinon, { stubInterface, stubObject } from 'ts-sinon';
 import * as sinonChai from 'sinon-chai';
-import { shared as lspCommon } from 'lightning-lsp-common';
+import { shared as lspCommon } from '@salesforce/lightning-lsp-common';
 
 chai.use(sinonChai);
 const { expect, assert } = chai;