diff --git a/Dockerfile.schedule b/Dockerfile.schedule
index ecb125e09..54bf74e96 100644
--- a/Dockerfile.schedule
+++ b/Dockerfile.schedule
@@ -2,8 +2,7 @@
 FROM node:20.16.0-slim AS base
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack enable
-RUN corepack prepare pnpm@9.12.0 --activate
+RUN corepack enable && corepack prepare pnpm@9.12.0 --activate
 
 FROM base AS build
 COPY . /usr/src/app
@@ -35,4 +34,5 @@ COPY --from=build /prod/schedules/dist ./dist
 COPY --from=build /prod/schedules/package.json ./package.json
 COPY --from=build /prod/schedules/node_modules ./node_modules
 
-CMD HOSTNAME=0.0.0.0 && pnpm start
\ No newline at end of file
+ENV HOSTNAME=0.0.0.0
+CMD ["pnpm", "start"]
\ No newline at end of file
diff --git a/Dockerfile.server b/Dockerfile.server
index ea6b372e8..baa7a33b9 100644
--- a/Dockerfile.server
+++ b/Dockerfile.server
@@ -2,8 +2,7 @@
 FROM node:20.16.0-slim AS base
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack enable
-RUN corepack prepare pnpm@9.12.0 --activate
+RUN corepack enable && corepack prepare pnpm@9.12.0 --activate
 
 FROM base AS build
 COPY . /usr/src/app
@@ -35,4 +34,5 @@ COPY --from=build /prod/api/dist ./dist
 COPY --from=build /prod/api/package.json ./package.json
 COPY --from=build /prod/api/node_modules ./node_modules
 
-CMD HOSTNAME=0.0.0.0 && pnpm start
\ No newline at end of file
+ENV HOSTNAME=0.0.0.0 
+CMD ["pnpm", "start"]
\ No newline at end of file