diff --git a/package.json b/package.json
index f9aef2f36b..f3a088b35e 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,8 @@
     "get-past-client-version": "node scripts/getPastClientVersion.js",
     "setup": "git config submodule.recurse true && git submodule update && node ./hosting/scripts/setup.js && yarn && yarn build && yarn dev",
     "build": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream",
+    "build:apps": "yarn build --scope @budibase/server --scope @budibase/worker",
+    "build:cli": "yarn build --scope @budibase/cli",
     "build:oss": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream --ignore @budibase/account-portal --ignore @budibase/account-portal-server --ignore @budibase/account-portal-ui",
     "build:account-portal": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream --scope @budibase/account-portal --scope @budibase/account-portal-server --scope @budibase/account-portal-ui",
     "build:dev": "lerna run --stream prebuild && yarn nx run-many --target=build --output-style=dynamic --watch --preserveWatchOutput",
diff --git a/scripts/build-single-image.sh b/scripts/build-single-image.sh
index 16b668e033..7ae6b0d9f6 100755
--- a/scripts/build-single-image.sh
+++ b/scripts/build-single-image.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
-yarn build --scope @budibase/server --scope @budibase/worker
+yarn build:apps
 version=$(./scripts/getCurrentVersion.sh)
 docker build -f hosting/single/Dockerfile -t budibase:latest --build-arg BUDIBASE_VERSION=$version --build-arg TARGETBUILD=single .
diff --git a/scripts/devDocker.sh b/scripts/devDocker.sh
index 5e01e5813a..f52074bae7 100755
--- a/scripts/devDocker.sh
+++ b/scripts/devDocker.sh
@@ -6,7 +6,7 @@ if [ ! -d "./packages/pro/src" ]; then
   exit 1
 fi
 
-yarn build --scope @budibase/server --scope @budibase/worker
+yarn build:apps
 docker-compose -f hosting/docker-compose.build.yaml -f hosting/docker-compose.dev.yaml --env-file hosting/.env up --build --scale proxy-service=0