diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml
index 96a6da61c..e73d58700 100644
--- a/.github/workflows/build_docker.yml
+++ b/.github/workflows/build_docker.yml
@@ -17,24 +17,6 @@ jobs:
     - name: Setup env
       run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
-    - name: Setup Node.js environment
-      uses: actions/setup-node@v4
-      with:
-        node-version: 18.18.2
-
-    - name: Setup pnpm
-      uses: pnpm/action-setup@v2
-      with:
-        version: 8
-
-    - name: Install dependencies
-      run: pnpm install --frozen-lockfile
-
-    - name: Build project packages
-      env:
-        SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-      run: pnpm turbo build:docker
-
     - name: Docker Login
       uses: docker/login-action@v2.1.0
       with:
diff --git a/Dockerfile b/Dockerfile
index 35ecc88b6..517b63f52 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,11 @@
-FROM node:18.18-alpine AS base
+FROM node:18.18-alpine AS builder
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 RUN corepack enable
-
-FROM base AS builder
 COPY . /app
 WORKDIR /app
-RUN pnpm install --frozen-lockfile \
-    && pnpm turbo build:docker
+RUN pnpm --filter=ontime-ui --filter=ontime-server --filter=ontime-utils install --config.dedupe-peer-dependents=false --frozen-lockfile
+RUN pnpm --filter=ontime-ui --filter=ontime-server run build:docker
 
 FROM node:18.18-alpine
 
diff --git a/package.json b/package.json
index 6468884a3..7ef0e49da 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,6 @@
     "build": "turbo run build",
     "build:local": "turbo run build:local",
     "build:electron": "turbo run build:electron",
-    "build:docker": "turbo run build:docker",
     "build:localdocker": "turbo run build:localdocker",
     "dist-win": "turbo run dist-win",
     "dist-mac": "turbo run dist-mac",
diff --git a/turbo.json b/turbo.json
index c92bb4bc6..49dec3d1a 100644
--- a/turbo.json
+++ b/turbo.json
@@ -25,7 +25,6 @@
     "build": {},
     "build:local": {},
     "build:electron": {},
-    "build:docker": {},
     "build:localdocker": {},
     "e2e": {
       "dependsOn": ["^build"]