diff --git a/Dockerfile b/Dockerfile
index def064bec..bb8b5fe13 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,9 +7,11 @@ ENV NODE_ENV=production
 
 COPY frontend .
 
+ARG VITE_API_BASE_URL=/api
+
 RUN apk add pnpm && \
     CI=true pnpm install && \
-    VITE_API_BASE_URL=http://localhost:8400/api pnpm build
+    VITE_API_BASE_URL=${VITE_API_BASE_URL} pnpm build
 
 # Build backend image that also serves frontend (stored in `/app/frontend-dist`)
 FROM python:3.14-alpine3.22
@@ -28,12 +30,12 @@ USER bracket
 
 RUN uv sync --no-dev --locked
 
-COPY --from=builder /app/dist /app/frontend-dist
+COPY --from=builder --chown=bracket:bracket /app/dist /app/frontend-dist
 
 EXPOSE 8400
 
-HEALTHCHECK --interval=3s --timeout=5s --retries=10 \
-    CMD ["wget", "-O", "/dev/null", "http://0.0.0.0:8400/ping"]
+HEALTHCHECK --interval=3s --timeout=5s --retries=10 --start-period=10s \
+    CMD wget -O - http://0.0.0.0:8400/api/ping | grep -q '"ping"'
 
 CMD [ \
     "uv", \