diff --git a/back/Dockerfile b/back/Dockerfile
index ce2ca25a..cc319474 100644
--- a/back/Dockerfile
+++ b/back/Dockerfile
@@ -27,4 +27,4 @@ WORKDIR /kyoo
 EXPOSE 5000
 # The back can take a long time to start if meilisearch is initializing
 HEALTHCHECK --interval=5s --retries=15 CMD curl --fail http://localhost:5000/health || exit
-CMD /app/Kyoo.Host
+ENTRYPOINT ["/app/Kyoo.Host"]
diff --git a/back/Dockerfile.dev b/back/Dockerfile.dev
index dc71fe07..f17a571f 100644
--- a/back/Dockerfile.dev
+++ b/back/Dockerfile.dev
@@ -20,5 +20,4 @@ EXPOSE 5000
 ENV DOTNET_USE_POLLING_FILE_WATCHER 1
 # HEALTHCHECK --interval=5s CMD curl --fail http://localhost:5000/health || exit
 HEALTHCHECK CMD true
-CMD dotnet watch run --no-restore --project /app/src/Kyoo.Host
-
+ENTRYPOINT ["dotnet", "watch", "run", "--no-restore", "--project", "/app/src/Kyoo.Host"]
diff --git a/front/Dockerfile.dev b/front/Dockerfile.dev
index d6b220f2..0bdb7cbd 100644
--- a/front/Dockerfile.dev
+++ b/front/Dockerfile.dev
@@ -14,4 +14,4 @@ RUN yarn --immutable
 ENV NEXT_TELEMETRY_DISABLED 1
 EXPOSE 3000
 EXPOSE 8081
-CMD yarn dev
+ENTRYPOINT ["yarn", "dev"]
diff --git a/scanner/Dockerfile b/scanner/Dockerfile
index 42ee69c9..0e778a6d 100644
--- a/scanner/Dockerfile
+++ b/scanner/Dockerfile
@@ -5,4 +5,4 @@ COPY ./requirements.txt .
 RUN pip3 install -r ./requirements.txt
 
 COPY . .
-CMD python3 -m scanner -v
+ENTRYPOINT ["python3", "-m", "scanner", "-v"]
diff --git a/transcoder/Dockerfile b/transcoder/Dockerfile
index 7971f120..44c9f6c2 100644
--- a/transcoder/Dockerfile
+++ b/transcoder/Dockerfile
@@ -17,4 +17,4 @@ RUN apk add --no-cache ffmpeg mediainfo musl-dev
 COPY --from=builder /usr/local/cargo/bin/transcoder ./transcoder
 
 EXPOSE 7666
-CMD ./transcoder
+ENTRYPOINT ["./transcoder"]
diff --git a/transcoder/Dockerfile.dev b/transcoder/Dockerfile.dev
index c08026a0..964b1173 100644
--- a/transcoder/Dockerfile.dev
+++ b/transcoder/Dockerfile.dev
@@ -10,4 +10,4 @@ RUN cargo build
 RUN rm src/lib.rs
 
 EXPOSE 7666
-CMD cargo watch -x run
+ENTRYPOINT ["cargo", "watch", "-x", "run"]