diff --git a/package.json b/package.json
index cd9338ef3..e166ce4ed 100644
--- a/package.json
+++ b/package.json
@@ -14,9 +14,9 @@
     "dev": "pnpm docker:up && pnpm dev:prepare && NEXT_PUBLIC_E2E_TEST=false turbo run dev --filter=builder --filter=viewer --parallel --no-cache",
     "dev:mocking": "pnpm docker:up && pnpm dev:prepare && NEXT_PUBLIC_E2E_TEST=true turbo run dev --filter=builder --filter=viewer --parallel --no-cache",
     "build": "pnpm docker:up && turbo run build",
-    "build:builder": "cp apps/builder/.env.docker apps/builder/.env.production && ENVSH_ENV=./apps/builder/.env.production ENVSH_OUTPUT=./apps/builder/public/__env.js bash env.sh pnpm turbo run build --scope=builder --include-dependencies",
-    "build:viewer": "cp apps/viewer/.env.docker apps/viewer/.env.production && ENVSH_ENV=./apps/viewer/.env.production ENVSH_OUTPUT=./apps/viewer/public/__env.js bash env.sh pnpm turbo run build --scope=viewer --include-dependencies",
-    "build:landing-page": "cp apps/landing-page/.env.docker apps/landing-page/.env.production && ENVSH_ENV=./apps/landing-page/.env.production ENVSH_OUTPUT=./apps/landing-page/public/__env.js ENVSH_VERBOSE=true bash env.sh pnpm turbo run build --scope=landing-page --include-dependencies",
+    "build:builder": "turbo run build --filter=builder... && ENVSH_ENV=./apps/builder/.env.docker ENVSH_OUTPUT=./apps/builder/public/__env.js bash env.sh",
+    "build:viewer": "turbo run build --filter=viewer... && ENVSH_ENV=./apps/viewer/.env.docker ENVSH_OUTPUT=./apps/viewer/public/__env.js bash env.sh",
+    "build:landing-page": "turbo run build --filter=landing-page... && ENVSH_ENV=./apps/landing-page/.env.docker ENVSH_OUTPUT=./apps/landing-page/public/__env.js bash env.sh",
     "test:builder": "cd apps/builder && pnpm test",
     "lint": "turbo run lint",
     "db:migrate": "cd packages/db && pnpm migration:deploy",
diff --git a/turbo.json b/turbo.json
index dea0de79e..7916caa80 100644
--- a/turbo.json
+++ b/turbo.json
@@ -3,7 +3,8 @@
   "pipeline": {
     "build": {
       "dependsOn": ["^build"],
-      "outputs": [".next/**", "dist/**", "build/**"]
+      "outputs": [".next/**", "dist/**", "build/**"],
+      "outputMode": "new-only"
     },
     "test": {
       "dependsOn": [],
@@ -14,9 +15,6 @@
     },
     "dev": {
       "dependsOn": ["^dev"]
-    },
-    "db#build": {
-      "cache": false
     }
   }
 }