diff --git a/packages/server/Dockerfile b/packages/server/Dockerfile
index 5e02877e44..ac7d4a1b3f 100644
--- a/packages/server/Dockerfile
+++ b/packages/server/Dockerfile
@@ -5,7 +5,7 @@ LABEL com.centurylinklabs.watchtower.lifecycle.pre-update="scripts/watchtower-ho
 LABEL com.centurylinklabs.watchtower.lifecycle.post-update="scripts/watchtower-hooks/post-update.sh"
 LABEL com.centurylinklabs.watchtower.lifecycle.post-check="scripts/watchtower-hooks/post-check.sh"
 
-WORKDIR /app
+WORKDIR /app/dist
 
 ENV PORT=4001
 ENV COUCH_DB_URL=https://couchdb.budi.live:5984
diff --git a/packages/server/package.json b/packages/server/package.json
index 818347781a..633082f07a 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -21,7 +21,7 @@
     "predocker": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client && yarn build",
     "build:docker": "yarn predocker && docker build . -t app-service --label version=$BUDIBASE_RELEASE_VERSION",
     "build:docs": "node ./scripts/docs/generate.js open",
-    "run:docker": "node index.js",
+    "run:docker": "node dist/index.js",
     "run:docker:cluster": "pm2-runtime start pm2.config.js",
     "dev:stack:up": "node scripts/dev/manage.js up",
     "dev:stack:down": "node scripts/dev/manage.js down",
diff --git a/packages/server/pm2.config.js b/packages/server/pm2.config.js
index a86b220c1e..b5fb1880ef 100644
--- a/packages/server/pm2.config.js
+++ b/packages/server/pm2.config.js
@@ -1,7 +1,7 @@
 module.exports = {
   apps: [
     {
-      script: "index.js",
+      script: "./dist/index.js",
       instances: "max",
       exec_mode: "cluster",
     },
diff --git a/packages/worker/Dockerfile b/packages/worker/Dockerfile
index 7eb7e1a69b..ee22d0f261 100644
--- a/packages/worker/Dockerfile
+++ b/packages/worker/Dockerfile
@@ -5,7 +5,7 @@ LABEL com.centurylinklabs.watchtower.lifecycle.pre-update="scripts/watchtower-ho
 LABEL com.centurylinklabs.watchtower.lifecycle.post-update="scripts/watchtower-hooks/post-update.sh"
 LABEL com.centurylinklabs.watchtower.lifecycle.post-check="scripts/watchtower-hooks/post-check.sh"
 
-WORKDIR /app
+WORKDIR /app/dist
 
 # handle node-gyp
 RUN apk add --no-cache --virtual .gyp python3 make g++
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 23e017c399..3da93bab2e 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -16,7 +16,7 @@
     "build": "cd ../.. && nx build @budibase/worker",
     "check:types": "tsc -p tsconfig.build.json --noEmit",
     "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
-    "run:docker": "node index.cjs",
+    "run:docker": "node dist/index.cjs",
     "debug": "yarn build && node --expose-gc --inspect=9223 dist/index.cjs",
     "run:docker:cluster": "pm2-runtime start pm2.config.js",
     "predocker": "yarn build",
diff --git a/packages/worker/pm2.config.js b/packages/worker/pm2.config.js
index 5603d9648c..d7b0ea1576 100644
--- a/packages/worker/pm2.config.js
+++ b/packages/worker/pm2.config.js
@@ -1,7 +1,7 @@
 module.exports = {
   apps: [
     {
-      script: "./index.cjs",
+      script: "./dist/index.cjs",
       instances: "max",
       exec_mode: "cluster",
     },