diff --git a/influxdb/3.0-core/entrypoint.sh b/influxdb/3.0-core/entrypoint.sh
index ea30f1c240a6323f7f324fd55140aac0c090cae5..ff7cecc834ae01fee6cf6db49dc195b6fe5c62bf 100755
--- a/influxdb/3.0-core/entrypoint.sh
+++ b/influxdb/3.0-core/entrypoint.sh
@@ -3,6 +3,10 @@ set -euo pipefail
 
 args=("${@}")
 
+if [[ "${args[0]:-}" == serve ]] ; then
+    args=(influxdb3 "${args[@]}")
+fi
+
 if [[ "${args[0]:-}" =~ ^- ]] ; then
     args=(influxdb3 serve "${args[@]}")
 fi
diff --git a/influxdb/3.0-enterprise/entrypoint.sh b/influxdb/3.0-enterprise/entrypoint.sh
index ea30f1c240a6323f7f324fd55140aac0c090cae5..ff7cecc834ae01fee6cf6db49dc195b6fe5c62bf 100755
--- a/influxdb/3.0-enterprise/entrypoint.sh
+++ b/influxdb/3.0-enterprise/entrypoint.sh
@@ -3,6 +3,10 @@ set -euo pipefail
 
 args=("${@}")
 
+if [[ "${args[0]:-}" == serve ]] ; then
+    args=(influxdb3 "${args[@]}")
+fi
+
 if [[ "${args[0]:-}" =~ ^- ]] ; then
     args=(influxdb3 serve "${args[@]}")
 fi