diff --git a/influxdb/3.0-core/entrypoint.sh b/influxdb/3.0-core/entrypoint.sh
index ab2af863e9bb8fe5cdef59cc0152ed9f2e16f6ad..662d45ffa43f2aa5979610bf95c218e6b6886584 100755
--- a/influxdb/3.0-core/entrypoint.sh
+++ b/influxdb/3.0-core/entrypoint.sh
@@ -1,9 +1,12 @@
 #!/bin/bash
 set -euo pipefail
 
-args=( "${@}" )
-for i in "${!args[@]}"; do
-    args[${i}]="$(echo "${args[${i}]}" | envsubst)"
-done
+args=("${@}")
+
+if [[ "${1}" == influxdb3 ]] ; then
+    for i in "${!args[@]}"; do
+        args[i]="$(envsubst <<<"${args[i]}")"
+    done
+fi
 
 exec "${args[@]}"
diff --git a/influxdb/3.0-enterprise/entrypoint.sh b/influxdb/3.0-enterprise/entrypoint.sh
index ab2af863e9bb8fe5cdef59cc0152ed9f2e16f6ad..662d45ffa43f2aa5979610bf95c218e6b6886584 100755
--- a/influxdb/3.0-enterprise/entrypoint.sh
+++ b/influxdb/3.0-enterprise/entrypoint.sh
@@ -1,9 +1,12 @@
 #!/bin/bash
 set -euo pipefail
 
-args=( "${@}" )
-for i in "${!args[@]}"; do
-    args[${i}]="$(echo "${args[${i}]}" | envsubst)"
-done
+args=("${@}")
+
+if [[ "${1}" == influxdb3 ]] ; then
+    for i in "${!args[@]}"; do
+        args[i]="$(envsubst <<<"${args[i]}")"
+    done
+fi
 
 exec "${args[@]}"