diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index 7864a1edd1..9e0f2a3f9d 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -24,7 +24,7 @@ services:
     user: '${UID:-0}:${GID:-0}'
     build:
       context: ../
-      dockerfile: server/Dockerfile
+      dockerfile: server/Dockerfile.dev
       target: dev
     restart: unless-stopped
     volumes:
@@ -85,7 +85,7 @@ services:
     user: '${UID:-0}:${GID:-0}'
     build:
       context: ../
-      dockerfile: server/Dockerfile
+      dockerfile: server/Dockerfile.dev
       target: dev
     command: ['immich-web']
     env_file:
diff --git a/server/Dockerfile b/server/Dockerfile
index 6bdf57d4dc..e95eca7c12 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,83 +1,4 @@
-# dev build
-FROM ghcr.io/immich-app/base-server-dev:202509091104@sha256:4f9275330f1e49e7ce9840758ea91839052fe6ed40972d5bb97a9af857fa956a AS dev
-
-ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0 \
-  CI=1 \
-  COREPACK_HOME=/tmp
-
-RUN npm install --global corepack@latest && \
-  corepack enable pnpm && \
-  echo "store-dir=/buildcache/pnpm-store" >> /usr/local/etc/npmrc && \
-  echo "devdir=/buildcache/node-gyp" >> /usr/local/etc/npmrc
-
-COPY ./package* ./pnpm* .pnpmfile.cjs /tmp/create-dep-cache/
-COPY ./web/package* ./web/pnpm* /tmp/create-dep-cache/web/
-COPY ./server/package* ./server/pnpm* /tmp/create-dep-cache/server/
-COPY ./open-api/typescript-sdk/package* ./open-api/typescript-sdk/pnpm* /tmp/create-dep-cache/open-api/typescript-sdk/
-WORKDIR /tmp/create-dep-cache
-RUN pnpm fetch && rm -rf /tmp/create-dep-cache && chmod -R o+rw /buildcache
-WORKDIR /usr/src/app
-
-ENV PATH="${PATH}:/usr/src/app/server/bin:/usr/src/app/web/bin" \
-  IMMICH_ENV=development \
-  NVIDIA_DRIVER_CAPABILITIES=all \
-  NVIDIA_VISIBLE_DEVICES=all
-ENTRYPOINT ["tini", "--", "/bin/bash", "-c"]
-
-FROM dev AS dev-container-server
-
-RUN apt-get update --allow-releaseinfo-change && \
-  apt-get install sudo inetutils-ping openjdk-11-jre-headless \
-  vim nano \
-  -y --no-install-recommends --fix-missing
-
-RUN usermod -aG sudo node && \
-  echo "node ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
-  mkdir -p /workspaces/immich
-
-RUN chown node:node -R /workspaces
-COPY --chown=node:node --chmod=755 ../.devcontainer/server/*.sh /immich-devcontainer/
-
-WORKDIR /workspaces/immich
-
-FROM dev-container-server AS dev-container-mobile
-USER root
-# Enable multiarch for arm64 if necessary
-RUN if [ "$(dpkg --print-architecture)" = "arm64" ]; then \
-  dpkg --add-architecture amd64 && \
-  apt-get update && \
-  apt-get install -y --no-install-recommends \
-  qemu-user-static \
-  libc6:amd64 \
-  libstdc++6:amd64 \
-  libgcc1:amd64; \
-  fi
-
-# Flutter SDK
-# https://flutter.dev/docs/development/tools/sdk/releases?tab=linux
-ENV FLUTTER_CHANNEL="stable"
-ENV FLUTTER_VERSION="3.32.8"
-ENV FLUTTER_HOME=/flutter
-ENV PATH=${PATH}:${FLUTTER_HOME}/bin
-
-# Flutter SDK
-RUN mkdir -p ${FLUTTER_HOME} \
-  && curl -C - --output flutter.tar.xz https://storage.googleapis.com/flutter_infra_release/releases/${FLUTTER_CHANNEL}/linux/flutter_linux_${FLUTTER_VERSION}-${FLUTTER_CHANNEL}.tar.xz \
-  && tar -xf flutter.tar.xz --strip-components=1 -C ${FLUTTER_HOME} \
-  && rm flutter.tar.xz \
-  && chown -R node ${FLUTTER_HOME}
-
-
-RUN apt-get update \
-  && wget -qO- https://dcm.dev/pgp-key.public | gpg --dearmor -o /usr/share/keyrings/dcm.gpg \
-  && echo 'deb [signed-by=/usr/share/keyrings/dcm.gpg arch=amd64] https://dcm.dev/debian stable main' | tee /etc/apt/sources.list.d/dart_stable.list \
-  && apt-get update \
-  && apt-get install dcm -y
-
-RUN dart --disable-analytics
-
-# production-builder-base image
-FROM ghcr.io/immich-app/base-server-dev:202509091104@sha256:4f9275330f1e49e7ce9840758ea91839052fe6ed40972d5bb97a9af857fa956a AS prod-builder-base
+FROM ghcr.io/immich-app/base-server-dev:202509091104@sha256:4f9275330f1e49e7ce9840758ea91839052fe6ed40972d5bb97a9af857fa956a AS builder
 ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0 \
   CI=1 \
   COREPACK_HOME=/tmp
@@ -85,8 +6,7 @@ ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0 \
 RUN npm install --global corepack@latest && \
   corepack enable pnpm
 
-# server production build
-FROM prod-builder-base AS server-prod
+FROM builder AS server
 
 WORKDIR /usr/src/app
 COPY ./package* ./pnpm* .pnpmfile.cjs ./
@@ -94,8 +14,7 @@ COPY ./server ./server/
 RUN SHARP_IGNORE_GLOBAL_LIBVIPS=true pnpm --filter immich --frozen-lockfile build && \
   SHARP_FORCE_GLOBAL_LIBVIPS=true pnpm --filter immich --frozen-lockfile --prod --no-optional deploy /output/server-pruned
 
-# web production build
-FROM prod-builder-base AS web-prod
+FROM builder AS web
 
 WORKDIR /usr/src/app
 COPY ./package* ./pnpm* .pnpmfile.cjs ./
@@ -105,7 +24,7 @@ COPY ./open-api ./open-api/
 RUN SHARP_IGNORE_GLOBAL_LIBVIPS=true pnpm --filter @immich/sdk --filter immich-web --frozen-lockfile --force install && \
   pnpm --filter @immich/sdk --filter immich-web build
 
-FROM prod-builder-base AS cli-prod
+FROM builder AS cli
 
 COPY ./package* ./pnpm* .pnpmfile.cjs ./
 COPY ./cli ./cli/
@@ -114,7 +33,6 @@ RUN pnpm --filter @immich/sdk --filter @immich/cli --frozen-lockfile install &&
   pnpm --filter @immich/sdk --filter @immich/cli build && \
   pnpm --filter @immich/cli --prod --no-optional deploy /output/cli-pruned
 
-# prod base image
 FROM ghcr.io/immich-app/base-server-prod:202509091104@sha256:d1ccbac24c84f2f8277cf85281edfca62d85d7daed6a62b8efd3a81bcd3c5e0e
 
 WORKDIR /usr/src/app
@@ -122,9 +40,9 @@ ENV NODE_ENV=production \
   NVIDIA_DRIVER_CAPABILITIES=all \
   NVIDIA_VISIBLE_DEVICES=all
 
-COPY --from=server-prod /output/server-pruned ./server
-COPY --from=web-prod /usr/src/app/web/build /build/www
-COPY --from=cli-prod /output/cli-pruned ./cli
+COPY --from=server /output/server-pruned ./server
+COPY --from=web /usr/src/app/web/build /build/www
+COPY --from=cli /output/cli-pruned ./cli
 RUN ln -s ../../cli/bin/immich server/bin/immich
 COPY LICENSE /licenses/LICENSE.txt
 COPY LICENSE /LICENSE
diff --git a/server/Dockerfile.dev b/server/Dockerfile.dev
new file mode 100644
index 0000000000..1db03bc844
--- /dev/null
+++ b/server/Dockerfile.dev
@@ -0,0 +1,77 @@
+# dev build
+FROM ghcr.io/immich-app/base-server-dev:202509091104@sha256:4f9275330f1e49e7ce9840758ea91839052fe6ed40972d5bb97a9af857fa956a AS dev
+
+ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0 \
+  CI=1 \
+  COREPACK_HOME=/tmp
+
+RUN npm install --global corepack@latest && \
+  corepack enable pnpm && \
+  echo "store-dir=/buildcache/pnpm-store" >> /usr/local/etc/npmrc && \
+  echo "devdir=/buildcache/node-gyp" >> /usr/local/etc/npmrc
+
+COPY ./package* ./pnpm* .pnpmfile.cjs /tmp/create-dep-cache/
+COPY ./web/package* ./web/pnpm* /tmp/create-dep-cache/web/
+COPY ./server/package* ./server/pnpm* /tmp/create-dep-cache/server/
+COPY ./open-api/typescript-sdk/package* ./open-api/typescript-sdk/pnpm* /tmp/create-dep-cache/open-api/typescript-sdk/
+WORKDIR /tmp/create-dep-cache
+RUN pnpm fetch && rm -rf /tmp/create-dep-cache && chmod -R o+rw /buildcache
+WORKDIR /usr/src/app
+
+ENV PATH="${PATH}:/usr/src/app/server/bin:/usr/src/app/web/bin" \
+  IMMICH_ENV=development \
+  NVIDIA_DRIVER_CAPABILITIES=all \
+  NVIDIA_VISIBLE_DEVICES=all
+ENTRYPOINT ["tini", "--", "/bin/bash", "-c"]
+
+FROM dev AS dev-container-server
+
+RUN apt-get update --allow-releaseinfo-change && \
+  apt-get install sudo inetutils-ping openjdk-11-jre-headless \
+  vim nano \
+  -y --no-install-recommends --fix-missing
+
+RUN usermod -aG sudo node && \
+  echo "node ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
+  mkdir -p /workspaces/immich
+
+RUN chown node:node -R /workspaces
+COPY --chown=node:node --chmod=755 ../.devcontainer/server/*.sh /immich-devcontainer/
+
+WORKDIR /workspaces/immich
+
+FROM dev-container-server AS dev-container-mobile
+USER root
+# Enable multiarch for arm64 if necessary
+RUN if [ "$(dpkg --print-architecture)" = "arm64" ]; then \
+  dpkg --add-architecture amd64 && \
+  apt-get update && \
+  apt-get install -y --no-install-recommends \
+  qemu-user-static \
+  libc6:amd64 \
+  libstdc++6:amd64 \
+  libgcc1:amd64; \
+  fi
+
+# Flutter SDK
+# https://flutter.dev/docs/development/tools/sdk/releases?tab=linux
+ENV FLUTTER_CHANNEL="stable"
+ENV FLUTTER_VERSION="3.32.8"
+ENV FLUTTER_HOME=/flutter
+ENV PATH=${PATH}:${FLUTTER_HOME}/bin
+
+# Flutter SDK
+RUN mkdir -p ${FLUTTER_HOME} \
+  && curl -C - --output flutter.tar.xz https://storage.googleapis.com/flutter_infra_release/releases/${FLUTTER_CHANNEL}/linux/flutter_linux_${FLUTTER_VERSION}-${FLUTTER_CHANNEL}.tar.xz \
+  && tar -xf flutter.tar.xz --strip-components=1 -C ${FLUTTER_HOME} \
+  && rm flutter.tar.xz \
+  && chown -R node ${FLUTTER_HOME}
+
+
+RUN apt-get update \
+  && wget -qO- https://dcm.dev/pgp-key.public | gpg --dearmor -o /usr/share/keyrings/dcm.gpg \
+  && echo 'deb [signed-by=/usr/share/keyrings/dcm.gpg arch=amd64] https://dcm.dev/debian stable main' | tee /etc/apt/sources.list.d/dart_stable.list \
+  && apt-get update \
+  && apt-get install dcm -y
+
+RUN dart --disable-analytics