diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
index e6dbb0118..b5c205734 100644
--- a/.gitpod.Dockerfile
+++ b/.gitpod.Dockerfile
@@ -1,7 +1,7 @@
 FROM gitpod/workspace-node
 
 # Install latest pnpm
-RUN pnpm i -g pnpm
+RUN curl -fsSL https://get.pnpm.io/install.sh | SHELL=`which bash` bash -
 
 # Install deno in gitpod
 RUN curl -fsSL https://deno.land/x/install/install.sh | sh
diff --git a/.gitpod/gitpod-setup.sh b/.gitpod/gitpod-setup.sh
index 883b3b1c9..0e739c46d 100755
--- a/.gitpod/gitpod-setup.sh
+++ b/.gitpod/gitpod-setup.sh
@@ -15,7 +15,7 @@ else
 fi
 
 # Wait for VSCode to be ready (port 23000)
-gp await-port 23000 > /dev/null 2>&1
+gp ports await 23000 > /dev/null 2>&1
 
 echo "Loading example project:" $EXAMPLE_PROJECT