diff --git a/ct/joplin-server.sh b/ct/joplin-server.sh
index 3f3dce619..60f8d32d9 100644
--- a/ct/joplin-server.sh
+++ b/ct/joplin-server.sh
@@ -45,9 +45,8 @@ function update_script() {
     $STD yarn config set --home enableTelemetry 0
     export BUILD_SEQUENCIAL=1
     $STD yarn workspaces focus @joplin/server
-    cd packages/server
-    $STD yarn run build
-    $STD yarn run tsc
+    $STD yarn workspaces foreach -R --topological-dev --from @joplin/server run build
+    $STD yarn workspaces foreach -R --topological-dev --from @joplin/server run tsc
     msg_ok "Updated Joplin-Server"
 
     msg_info "Starting Services"
diff --git a/install/joplin-server-install.sh b/install/joplin-server-install.sh
index 7b7d18018..b5f7eab81 100644
--- a/install/joplin-server-install.sh
+++ b/install/joplin-server-install.sh
@@ -37,8 +37,8 @@ sed -i "/onenote-converter/d" packages/lib/package.json
 $STD yarn config set --home enableTelemetry 0
 export BUILD_SEQUENCIAL=1
 $STD yarn workspaces focus @joplin/server
-cd /opt/joplin-server/packages/server
-$STD yarn rebuild
+$STD yarn workspaces foreach -R --topological-dev --from @joplin/server run build
+$STD yarn workspaces foreach -R --topological-dev --from @joplin/server run tsc
 cat <<EOF >/opt/joplin-server/.env
 PM2_HOME=/opt/pm2
 NODE_ENV=production