diff --git a/.github/workflows/node.yaml b/.github/workflows/node.yaml
index 23469b4102..80686529dd 100644
--- a/.github/workflows/node.yaml
+++ b/.github/workflows/node.yaml
@@ -335,7 +335,7 @@ jobs:
           yarn install
           yarn lerna run --scope \*\*/${{ matrix.gateway-name }} --include-dependencies --stream build
           yarn run pinst --disable
-          yarn workspaces focus --all --production
+          yarn workspaces focus ${{ matrix.gateway-name }} --production
       - name: Set up Docker Buildx
         if: steps.check-build-and-push.outputs.enable == 'true'
         uses: docker/setup-buildx-action@v3
diff --git a/meteor/Dockerfile b/meteor/Dockerfile
index eaccd9d35f..00c36b4e9e 100644
--- a/meteor/Dockerfile
+++ b/meteor/Dockerfile
@@ -27,7 +27,7 @@ RUN npm install
 
 # Install production dependencies for the worker
 WORKDIR /opt/core/packages
-RUN yarn workspaces focus --all --production
+RUN yarn workspaces focus --production @sofie-automation/job-worker @sofie-automation/corelib
 
 # DEPLOY IMAGE
 FROM node:14-alpine
diff --git a/packages/mos-gateway/Dockerfile b/packages/mos-gateway/Dockerfile
index 06e4eb7e4e..1efa36de62 100644
--- a/packages/mos-gateway/Dockerfile
+++ b/packages/mos-gateway/Dockerfile
@@ -10,7 +10,7 @@ RUN yarn install --immutable
 RUN yarn run pinst --disable
 RUN yarn lerna run --scope \*\*/mos-gateway --include-dependencies --stream build
 RUN yarn plugin import workspace-tools
-RUN yarn workspaces focus --all --production # purge dev-dependencies
+RUN yarn workspaces focus mos-gateway --production # purge dev-dependencies
 
 # DEPLOY IMAGE
 FROM node:18-alpine
diff --git a/packages/playout-gateway/Dockerfile b/packages/playout-gateway/Dockerfile
index b1aa61a5dc..cf3d4516fd 100644
--- a/packages/playout-gateway/Dockerfile
+++ b/packages/playout-gateway/Dockerfile
@@ -10,7 +10,7 @@ RUN yarn install --immutable
 RUN yarn run pinst --disable
 RUN yarn lerna run --scope \*\*/playout-gateway --include-dependencies --stream build
 RUN yarn plugin import workspace-tools
-RUN yarn workspaces focus --all --production # purge dev-dependencies
+RUN yarn workspaces focus playout-gateway --production # purge dev-dependencies
 
 # DEPLOY IMAGE
 FROM node:18-alpine