diff --git a/Dockerfile b/Dockerfile
index 348764b27..8eb1fd68e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ COPY pnpm-lock.yaml .npmrc pnpm-workspace.yaml ./
 RUN pnpm fetch
 ADD . ./
 RUN pnpm install -r --offline
-RUN pnpm turbo run build --filter=${SCOPE}...
+RUN pnpm turbo run build:docker --filter=${SCOPE}...
 
 FROM base AS runner
 WORKDIR /app
diff --git a/apps/builder/package.json b/apps/builder/package.json
index a2d3059a8..76bbe6d09 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -3,8 +3,9 @@
   "version": "0.1.0",
   "license": "AGPL-3.0-or-later",
   "scripts": {
-    "dev": "cross-env ENVSH_ENV=.env.local sh ../../env.sh next dev -p 3000",
-    "build": "next build",
+    "dev": "cross-env ENVSH_ENV=.env.local bash ../../env.sh next dev -p 3000",
+    "build": "cross-env ENVSH_ENV=.env.local bash ../../env.sh next build",
+    "build:docker": "next build",
     "build:env": "cd ../.. && cross-env ENVSH_ENV=./apps/builder/.env.docker ENVSH_OUTPUT=./apps/builder/public/__env.js bash env.sh",
     "start": "next start",
     "lint": "next lint",
diff --git a/apps/viewer/package.json b/apps/viewer/package.json
index beef22198..798d65474 100644
--- a/apps/viewer/package.json
+++ b/apps/viewer/package.json
@@ -3,8 +3,9 @@
   "license": "AGPL-3.0-or-later",
   "version": "0.1.0",
   "scripts": {
-    "dev": "cross-env ENVSH_ENV=.env.local sh ../../env.sh next dev -p 3001",
-    "build": "next build",
+    "dev": "cross-env ENVSH_ENV=.env.local bash ../../env.sh next dev -p 3001",
+    "build": "cross-env ENVSH_ENV=.env.local bash ../../env.sh next build",
+    "build:docker": "next build",
     "build:env": "cd ../.. && cross-env ENVSH_ENV=./apps/viewer/.env.docker ENVSH_OUTPUT=./apps/viewer/public/__env.js bash env.sh",
     "start": "next start -p 3001",
     "lint": "next lint",
diff --git a/package.json b/package.json
index ea27c6b67..a1e09cfb7 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "build:builder": "turbo run build --filter=builder... && turbo run build:env --filter=builder...",
     "build:viewer": "turbo run build --filter=viewer... && turbo run build:env --filter=viewer...",
     "build:landing-page": "turbo run build --filter=landing-page... && turbo run build:env --filter=landing-page...",
+    "build:apps": "turbo run build --filter=builder... --filter=viewer...",
     "db:migrate": "cd packages/db && pnpm run db:migrate",
     "generate-change-log": "pnpx gitmoji-changelog"
   },
diff --git a/turbo.json b/turbo.json
index 898500d72..6b6f8509b 100644
--- a/turbo.json
+++ b/turbo.json
@@ -13,6 +13,11 @@
       "outputs": [".next/**", "dist/**", "build/**"],
       "outputMode": "new-only"
     },
+    "build:docker": {
+      "dependsOn": ["^build", "db#db:generate"],
+      "outputs": [".next/**", "dist/**", "build/**"],
+      "outputMode": "new-only"
+    },
     "docs#build": {
       "dependsOn": ["api:generate"],
       "outputs": ["build/**"],