diff --git a/machamp_scripts/Dockerfile b/machamp_scripts/Dockerfile
index 0d3f8716c..a5f3878ed 100644
--- a/machamp_scripts/Dockerfile
+++ b/machamp_scripts/Dockerfile
@@ -94,9 +94,8 @@ RUN \
 RUN set -eux; \
         echo '#!/bin/sh' > /usr/local/bin/docker-entrypoint.sh; \
         echo 'set -e' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo "# first arg is '-f' or '--some-option'" >> /usr/local/bin/docker-entrypoint.sh; \
-        echo "# or first arg is `something.conf`" >> /usr/local/bin/docker-entrypoint.sh; \
-        echo 'if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \
+        echo "# perpend `keydb-server` if not provided as first argument" >> /usr/local/bin/docker-entrypoint.sh; \
+        echo 'if [  != "keydb-server" ]' >> /usr/local/bin/docker-entrypoint.sh; \
         echo '        set -- keydb-server "$@"' >> /usr/local/bin/docker-entrypoint.sh; \
         echo 'fi' >> /usr/local/bin/docker-entrypoint.sh; \
         echo "# allow the container to be started with `--user`" >> /usr/local/bin/docker-entrypoint.sh; \