diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4d313e2c..26b54975 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -41,11 +41,12 @@ RUN cd /app && \
     pip install --no-cache-dir -r requirements.txt
 
 # Use a dedicated Node.js stage for frontend building
-FROM node:20-slim AS frontend-builder
+FROM node:20 AS frontend-builder
 WORKDIR /app/frontend
 COPY --from=builder /app /app
-RUN npm install --legacy-peer-deps && \
-    npm run build && \
+RUN corepack enable && corepack prepare yarn@stable --activate && \
+    yarn install && \
+    yarn build && \
     find . -maxdepth 1 ! -name '.' ! -name 'dist' -exec rm -rf '{}' \;
 
 FROM python:3.13-slim
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 478d94d0..d2afb3a3 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -40,8 +40,14 @@ export DISPATCHARR_PORT=${DISPATCHARR_PORT:-9191}
 
 # Extract version information from version.py
 export DISPATCHARR_VERSION=$(python -c "import sys; sys.path.append('/app'); import version; print(version.__version__)")
-export DISPATCHARR_BUILD=$(python -c "import sys; sys.path.append('/app'); import version; print(version.__build__)")
-echo "📦 Dispatcharr version: ${DISPATCHARR_VERSION}-${DISPATCHARR_BUILD}"
+export DISPATCHARR_TIMESTAMP=$(python -c "import sys; sys.path.append('/app'); import version; print(version.__timestamp__ or '')")
+
+# Display version information with timestamp if available
+if [ -n "$DISPATCHARR_TIMESTAMP" ]; then
+    echo "📦 Dispatcharr version: ${DISPATCHARR_VERSION} (build: ${DISPATCHARR_TIMESTAMP})"
+else
+    echo "📦 Dispatcharr version: ${DISPATCHARR_VERSION}"
+fi
 
 # READ-ONLY - don't let users change these
 export POSTGRES_DIR=/data/db
@@ -64,7 +70,7 @@ if [[ ! -f /etc/profile.d/dispatcharr.sh ]]; then
     echo "export POSTGRES_DIR=$POSTGRES_DIR" >> /etc/profile.d/dispatcharr.sh
     echo "export DISPATCHARR_PORT=$DISPATCHARR_PORT" >> /etc/profile.d/dispatcharr.sh
     echo "export DISPATCHARR_VERSION=$DISPATCHARR_VERSION" >> /etc/profile.d/dispatcharr.sh
-    echo "export DISPATCHARR_BUILD=$DISPATCHARR_BUILD" >> /etc/profile.d/dispatcharr.sh
+    echo "export DISPATCHARR_TIMESTAMP=$DISPATCHARR_TIMESTAMP" >> /etc/profile.d/dispatcharr.sh
 fi
 
 chmod +x /etc/profile.d/dispatcharr.sh