diff --git a/Dockerfile b/Dockerfile
index e67b03957..721133e2d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,9 +22,9 @@ RUN pnpm deploy --filter=app-builder --prod /prod/app-builder
 
 FROM base AS app-builder
 ENV NODE_ENV=production
-ENV PORT=8080
+ENV PORT=${PORT:-8080}
 RUN apt-get update && apt-get install -y curl
 COPY --from=build /prod/app-builder /prod/app-builder
 WORKDIR /prod/app-builder
-EXPOSE 8080
+EXPOSE $PORT
 CMD [ "pnpm", "start"]
diff --git a/Dockerfile_local b/Dockerfile_local
index d45b3852e..9584a569e 100644
--- a/Dockerfile_local
+++ b/Dockerfile_local
@@ -14,9 +14,9 @@ RUN pnpm deploy --filter=app-builder --prod /prod/app-builder
 
 FROM base AS app-builder
 ENV NODE_ENV=production
-ENV PORT=8080
+ENV PORT=${PORT:-8080}
 RUN apt-get update && apt-get install -y curl
 COPY --from=build /prod/app-builder /prod/app-builder
 WORKDIR /prod/app-builder
-EXPOSE 8080
+EXPOSE $PORT
 CMD [ "pnpm", "start"]