diff --git a/influxdb3-core/3.0/Dockerfile b/influxdb3-core/3.0/Dockerfile
index c4a5e79e99184a9246e7f707f0af5cad43bfa2a1..e4857248b17973a34206a4d30e4dd873e1c6d0b1 100644
--- a/influxdb3-core/3.0/Dockerfile
+++ b/influxdb3-core/3.0/Dockerfile
@@ -33,6 +33,7 @@ RUN case "$(dpkg --print-architecture)" in \
         "influxdb3-core-${INFLUXDB_VERSION}_linux_${ARCH}.tar.gz" && \
     # Install InfluxDB3 Core \
     tar --strip-components 1 -C /usr/lib/influxdb3 -xvf "influxdb3-core-${INFLUXDB_VERSION}_linux_${ARCH}.tar.gz" && \
+    mv /usr/lib/influxdb3/influxdb3 /usr/bin/influxdb3 && \
     chown -R influxdb3:influxdb3 /var/lib/influxdb3 /plugins && \
     chown -R root:root /usr/lib/influxdb3 && \
     # Cleanup \
@@ -52,4 +53,4 @@ ENV LOG_FILTER=info
 EXPOSE 8181
 
 ENTRYPOINT ["/usr/bin/entrypoint.sh"]
-CMD ["serve"]
+CMD ["influxdb3", "serve"]
diff --git a/influxdb3-core/3.0/entrypoint.sh b/influxdb3-core/3.0/entrypoint.sh
index f5262374ff50e03519f4117fddea089bbc8b8f59..ab2af863e9bb8fe5cdef59cc0152ed9f2e16f6ad 100755
--- a/influxdb3-core/3.0/entrypoint.sh
+++ b/influxdb3-core/3.0/entrypoint.sh
@@ -6,4 +6,4 @@ for i in "${!args[@]}"; do
     args[${i}]="$(echo "${args[${i}]}" | envsubst)"
 done
 
-exec /usr/lib/influxdb3/influxdb3 "${args[@]}"
+exec "${args[@]}"
diff --git a/influxdb3-enterprise/3.0/Dockerfile b/influxdb3-enterprise/3.0/Dockerfile
index 9a147fe28b7c7c77b913eac112792f17ad8e3f7c..ef39bddfade63260d6ea2ec9a77bb3df7cfebdc5 100644
--- a/influxdb3-enterprise/3.0/Dockerfile
+++ b/influxdb3-enterprise/3.0/Dockerfile
@@ -33,6 +33,7 @@ RUN case "$(dpkg --print-architecture)" in \
         "influxdb3-enterprise-${INFLUXDB_VERSION}_linux_${ARCH}.tar.gz" && \
     # Install InfluxDB3 Enterprise \
     tar --strip-components 1 -C /usr/lib/influxdb3 -xvf "influxdb3-enterprise-${INFLUXDB_VERSION}_linux_${ARCH}.tar.gz" && \
+    mv /usr/lib/influxdb3/influxdb3 /usr/bin/influxdb3 && \
     chown -R influxdb3:influxdb3 /var/lib/influxdb3 /plugins && \
     chown -R root:root /usr/lib/influxdb3 && \
     # Cleanup \
@@ -52,4 +53,4 @@ ENV LOG_FILTER=info
 EXPOSE 8181
 
 ENTRYPOINT ["/usr/bin/entrypoint.sh"]
-CMD ["serve"]
+CMD ["influxdb3", "serve"]
diff --git a/influxdb3-enterprise/3.0/entrypoint.sh b/influxdb3-enterprise/3.0/entrypoint.sh
index f5262374ff50e03519f4117fddea089bbc8b8f59..ab2af863e9bb8fe5cdef59cc0152ed9f2e16f6ad 100755
--- a/influxdb3-enterprise/3.0/entrypoint.sh
+++ b/influxdb3-enterprise/3.0/entrypoint.sh
@@ -6,4 +6,4 @@ for i in "${!args[@]}"; do
     args[${i}]="$(echo "${args[${i}]}" | envsubst)"
 done
 
-exec /usr/lib/influxdb3/influxdb3 "${args[@]}"
+exec "${args[@]}"