diff --git a/.gitpod.yml b/.gitpod.yml
index 90932a95d2597..08d31ae90b897 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -5,13 +5,13 @@ ports:
     onOpen: open-browser
 tasks:
   - init: |
-      yarn
-      yarn server:init
+      npm ci
+      npm run server:init
     command: |
       gp sync-done init
       export NODE_ENV=development
       export VSCODE_DEV=1
-      yarn gulp watch-init
+      npm run watch
     name: watch app
   - command: |
       export NODE_ENV=development
diff --git a/package.json b/package.json
index 23109e98e9601..888ea4e65aaad 100644
--- a/package.json
+++ b/package.json
@@ -66,8 +66,8 @@
     "extensions-ci-pr": "node ./node_modules/gulp/bin/gulp.js extensions-ci-pr",
     "perf": "node scripts/code-perf.js",
     "update-build-ts-version": "npm install typescript@next && tsc -p ./build/tsconfig.build.json",
-    "server:init": "yarn --cwd ./build compile && yarn compile && yarn download-builtin-extensions",
-    "server:smoketest": "yarn --cwd ./test/smoke compile && yarn smoketest-no-compile --web --verbose --headless --electronArgs=\"--disable-dev-shm-usage --use-gl=swiftshader\""
+    "server:init": "npm run compile && npm run download-builtin-extensions",
+    "server:smoketest": "npm run smoketest -- --web --verbose --headless --electronArgs=\"--disable-dev-shm-usage --use-gl=swiftshader\""
   },
   "dependencies": {
     "@microsoft/1ds-core-js": "^3.2.13",