diff --git a/.dockerignore b/.dockerignore
index 2abeb2727..0638c4ef1 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,8 +1,9 @@
-.git/
-build/
-.github/
-.tx/
-cockatrice/
-doc/
-oracle/
-Dockerfile
+# Add (Ignore) everything in root for minimum image
+/*
+
+# Exclude (Allow) only folder & files required for building Servatrice
+!cmake/
+!libcockatrice_*/
+!servatrice/
+!CMakeLists.txt
+!LICENSE
diff --git a/Dockerfile b/Dockerfile
index d185b746a..8b79aab75 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,43 +1,52 @@
 # -------- Build Stage --------
-FROM ubuntu:24.04 AS build
+FROM debian:13 AS build
 
 ARG DEBIAN_FRONTEND=noninteractive
 
+# Install build dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
-  build-essential \
   cmake \
-  file \
   g++ \
-  git \
   libmariadb-dev-compat \
   libprotobuf-dev \
   libqt6sql6-mysql \
-  qt6-websockets-dev \
+  ninja-build \
   protobuf-compiler \
   qt6-tools-dev \
-  qt6-tools-dev-tools
+  qt6-tools-dev-tools \
+  qt6-websockets-dev \
+    && rm -rf /var/lib/apt/lists/*
 
+# Copy repo source not excluded in .dockerignore
 WORKDIR /src
 COPY . .
-RUN mkdir build && cd build && \
-    cmake .. -DWITH_SERVER=1 -DWITH_CLIENT=0 -DWITH_ORACLE=0 && \
-    make -j$(nproc) && \
-    make install
+
+# Configure CMake
+RUN cmake -S . -B build -G Ninja \
+  -DWITH_SERVER=1 -DWITH_CLIENT=0 -DWITH_ORACLE=0
+
+# Build and install Servatrice
+RUN cmake --build build --parallel $(nproc) \
+  && cmake --install build
 
 
 # -------- Runtime Stage (clean) --------
-FROM ubuntu:24.04
+FROM debian:13-slim
 
+# Install runtime dependencies
+# Is libprotobuf-lite32t64 enough?
 RUN apt-get update && apt-get install -y --no-install-recommends \
   libprotobuf32t64 \
   libqt6sql6-mysql \
   libqt6websockets6 \
-    && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-# Only copy installed binaries, not source
-COPY --from=build /usr/local /usr/local
+# Copy only resulting binaries from Build Stage
+COPY --from=build /usr/local/bin/servatrice /usr/local/bin/servatrice
 
+# Create and run as non-root user
+RUN useradd -m servatrice
+USER servatrice
 WORKDIR /home/servatrice
 
 EXPOSE 4748