diff --git a/packages/server/README.md b/packages/server/README.md
index 8363d88f..09f87e76 100644
--- a/packages/server/README.md
+++ b/packages/server/README.md
@@ -6,7 +6,7 @@ This package contains a LSP server wrapper for the `language-support` package.
 
 To package the language server into a single javascript bundle, go to the root of the project and
 do `npm run assemble` or `npm run assemble -- -- --minify` if you'd rather have the code minified.
-After that a file `./packages/server/out/cypher-language-server.js` will be generated.
+After that a file `./packages/server/dist/cypher-language-server.js` will be generated.
 
 You can run the language server with `node ./cypher-language-server.js --stdio`.
 
diff --git a/packages/server/package.json b/packages/server/package.json
index 6d0b52fe..2c8b36b9 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -4,7 +4,7 @@
   "author": "neo4j",
   "license": "Apache",
   "version": "0.0.1",
-  "main": "out/server.js",
+  "main": "dist/server.js",
   "types": "src/server.ts",
   "dependencies": {
     "language-support": "*",
@@ -14,10 +14,10 @@
     "vscode-languageserver-textdocument": "^1.0.8"
   },
   "scripts": {
-    "build": "esbuild ./src/server.ts --bundle --outfile=./out/server.js --format=cjs --platform=node --external:antlr4",
+    "build": "tsc --noEmit && esbuild ./src/server.ts --bundle --outfile=./dist/server.js --format=cjs --platform=node --external:antlr4",
     "clean": "rm -rf out",
-    "watch": "npm run build",
-    "assemble": "esbuild ./src/server.ts --bundle --outfile=./out/cypher-language-server.js --format=esm --platform=node"
+    "watch": "esbuild ./src/server.ts --bundle --outfile=./dist/server.js --format=cjs --platform=node --external:antlr4 --watch ",
+    "assemble": "esbuild ./src/server.ts --bundle --outfile=./dist/cypher-language-server.js --format=esm --platform=node"
   },
   "devDependencies": {
     "esbuild": "^0.19.4"
diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json
index df12079d..564a5990 100644
--- a/packages/server/tsconfig.json
+++ b/packages/server/tsconfig.json
@@ -1,8 +1,4 @@
 {
   "extends": "../../tsconfig.base.json",
-  "include": ["src"],
-  "compilerOptions": {
-    "outDir": "out",
-    "module": "CommonJS"
-  }
+  "include": ["src"]
 }
diff --git a/packages/vscode-playground/package.json b/packages/vscode-playground/package.json
index 304d0f2f..2183b137 100644
--- a/packages/vscode-playground/package.json
+++ b/packages/vscode-playground/package.json
@@ -11,7 +11,7 @@
   "activationEvents": [
     "onLanguage:cypher"
   ],
-  "main": "./out/src/extension",
+  "main": "./dist/src/extension",
   "contributes": {
     "languages": [
       {
@@ -72,9 +72,9 @@
     }
   },
   "scripts": {
-    "build": "tsc -b && cp -r ./e2e_tests/fixtures ./out/e2e_tests/fixtures",
+    "build": "tsc -b && cp -r ./e2e_tests/fixtures ./dist/e2e_tests/fixtures",
     "clean": "rm -rf out",
-    "test:e2e": "rm -rf .vscode-test/user-data && node ./out/e2e_tests/main.js",
+    "test:e2e": "rm -rf .vscode-test/user-data && node ./dist/e2e_tests/main.js",
     "watch": "tsc -b -w"
   },
   "dependencies": {
diff --git a/packages/vscode-playground/tsconfig.json b/packages/vscode-playground/tsconfig.json
index b5e85ca6..3c839fed 100644
--- a/packages/vscode-playground/tsconfig.json
+++ b/packages/vscode-playground/tsconfig.json
@@ -1,5 +1,5 @@
 {
   "extends": "../../tsconfig.base.json",
   "include": ["src", "e2e_tests"],
-  "compilerOptions": { "outDir": "out" }
+  "compilerOptions": { "outDir": "dist" }
 }