diff --git a/.dockerignore b/.dockerignore
index b825bcd1f..6abcb6de0 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -43,4 +43,4 @@ Mnesia.nonode@nohost/
 /ejabberd-*.rpm
 /ejabberd-*.run
 /ejabberd-*.tar.gz
-
+/.github/container/Dockerfile
diff --git a/.github/container/Dockerfile b/.github/container/Dockerfile
index 3d0b861e7..107dfeeb0 100644
--- a/.github/container/Dockerfile
+++ b/.github/container/Dockerfile
@@ -146,7 +146,7 @@ RUN apk add --no-cache \
         $(cat /tmp/runDeps)
 
 ################################################################################
-#' Finalize runtime environment
+#' Remove erlang/OTP & rebar3 from base image, finalize runtime environment
 FROM runtime-${METHOD} AS runtime
 ARG USER
 ARG UID
@@ -180,5 +180,5 @@ USER $USER
 VOLUME ["/$HOME"]
 EXPOSE 1883 4369-4399 5210 5222 5269 5280 5443
 
-ENTRYPOINT ["/sbin/tini","--","/usr/local/bin/ejabberdctl"]
+ENTRYPOINT ["/sbin/tini","--","ejabberdctl"]
 CMD ["foreground"]