diff --git a/scripts/cli/builder/Dockerfile b/scripts/cli/builder/Dockerfile
index f759ff26c7..f2d9747ef4 100644
--- a/scripts/cli/builder/Dockerfile
+++ b/scripts/cli/builder/Dockerfile
@@ -54,4 +54,4 @@ RUN echo 'export HOSTNAME=$(cat /tmp/container.id)' >> ~/.bashrc
 
 WORKDIR /sleeper-builder
 
-CMD [ "bash" ]
+ENTRYPOINT [ "bash" ]
diff --git a/scripts/cli/environment/Dockerfile b/scripts/cli/environment/Dockerfile
index e6986f3272..3f063ed089 100644
--- a/scripts/cli/environment/Dockerfile
+++ b/scripts/cli/environment/Dockerfile
@@ -37,4 +37,4 @@ WORKDIR /sleeper
 COPY . .
 
 ENV PATH=/sleeper/bin:$PATH
-CMD [ "bash" ]
+ENTRYPOINT [ "bash" ]