diff --git a/.gitlab-ci.yaml b/.gitlab-ci.yaml
index cda596fd4b7698e06b6af14532a6f0b9776ec242..c59132ab928a4e60cd16615bb22c7ed415ea9754 100644
--- a/.gitlab-ci.yaml
+++ b/.gitlab-ci.yaml
@@ -263,7 +263,7 @@ include:
 .hivemind-postgrest-serve-script: &hivemind-postgrest-serve-script |
   ${DATA_CACHE_HAF}/await -t 5m http://haf-instance:8091 -- echo "HAF ready" 2>&1 | tee -i "$AWAIT_LOG_PATH" && \
   ${DATA_CACHE_HAF}/await -t 5m postgres://haf_admin@haf-instance:5432/haf_block_log#schemas=hivemind_app -- echo "Hivemind database found" 2>&1 | tee -a -i "$AWAIT_LOG_PATH" && \
-  ${WORKING_DIR}/docker_entrypoint.sh postgrest-server --webserver-port=${RUNNER_HIVEMIND_SERVER_HTTP_PORT} --log-level=${LOG_LEVEL}
+  ${WORKING_DIR}/docker_entrypoint.sh server --webserver-port=${RUNNER_HIVEMIND_SERVER_HTTP_PORT} --log-level=${LOG_LEVEL}
 
 #<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<| BASH SCRIPTS |<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
diff --git a/docker/docker_entrypoint.sh b/docker/docker_entrypoint.sh
index d83f100ec3a6de86387c51871e622b6915f41e1a..ca8976e3869d3b98e6f87dc7396737cd88477155 100755
--- a/docker/docker_entrypoint.sh
+++ b/docker/docker_entrypoint.sh
@@ -191,11 +191,14 @@ case "$COMMAND" in
       date --utc --iso-8601=seconds > /tmp/block_processing_startup_time.txt
       run_hive
       ;;
-    postgrest-server)
+    server)
       HIVEMIND_ARGS=("${HIVEMIND_ARGS[@]:1}")
       log "global" "Running Hivemind with arguments '${HIVEMIND_ARGS[*]}'"
       run_hive
       ;;
+    *)
+      log "global" "COMMAND - first argument is not valid. Available commands: setup, install_app, uninstall_app, sync, server"
+      ;;
 esac
 
 log "global" "Exiting docker entrypoint..."