diff --git a/Dockerfile b/Dockerfile
index 812821452f4d..4e6762c72b06 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,4 +27,5 @@ RUN apt-get install -y locales &&
 # configured in /etc/default/locale so we need to set it manually.
 ENV LANG=en_US.UTF-8
 # Unfortunately `.` does not work with code-server.
-CMD code-server $PWD
+ENTRYPOINT ["code-server"]
+CMD ["$PWD"]