diff --git a/helix-p4d/Dockerfile b/helix-p4d/Dockerfile
index 552b294..8af7077 100644
--- a/helix-p4d/Dockerfile
+++ b/helix-p4d/Dockerfile
@@ -62,5 +62,5 @@ HEALTHCHECK --interval=1m --timeout=5s --start-period=30s \
 
 SHELL ["/bin/bash", "-c"]
 ENTRYPOINT ["/docker-entrypoint.sh"]
-# Using shell-form is required for ${P4PORT} to be correctly resolved (not working in JSON format).
-CMD gosu perforce p4d -p "${P4PORT}"
+# Using shell-form is required for ${P4PORT} and ${P4D_CASE_SENSITIVE_FLAG} to be resolved at runtime.
+CMD gosu perforce p4d "${P4D_CASE_SENSITIVE_FLAG}" -p "${P4PORT}"
diff --git a/helix-p4d/docker-entrypoint.sh b/helix-p4d/docker-entrypoint.sh
index a3eadde..07d190c 100755
--- a/helix-p4d/docker-entrypoint.sh
+++ b/helix-p4d/docker-entrypoint.sh
@@ -30,6 +30,12 @@ if [[ "${P4D_USE_UNICODE}" == "true" ]]; then
     export P4CHARSET="${P4CHARSET:-auto}"
 fi
 
+if [[ "${P4D_CASE_SENSITIVE}" == "true" ]]; then
+    export P4D_CASE_SENSITIVE_FLAG=-C0
+else
+    export P4D_CASE_SENSITIVE_FLAG=-C1
+fi
+
 # validate swarm trigger parameters
 if [[ "${INSTALL_SWARM_TRIGGER}" == "true" ]]; then
     if [[ -z "${SWARM_TRIGGER_HOST}" ]]; then
diff --git a/helix-p4d/docker-startup.d/11-configure-tls-version.sh b/helix-p4d/docker-startup.d/11-configure-tls-version.sh
index 7bb2bf1..0d6cd07 100755
--- a/helix-p4d/docker-startup.d/11-configure-tls-version.sh
+++ b/helix-p4d/docker-startup.d/11-configure-tls-version.sh
@@ -4,10 +4,10 @@ set -e
 
 # install TLS certificate files
 if [[ -n "${P4D_SSL_TLS_VERSION_MIN}" ]]; then
-  echo "Running: set ssl.tls.version.min=${P4D_SSL_TLS_VERSION_MIN}"
-  gosu perforce p4d -r "${P4ROOT}" -c "set ssl.tls.version.min=${P4D_SSL_TLS_VERSION_MIN}"
+  echo "Running: p4d ${P4D_CASE_SENSITIVE_FLAG} -r ${P4ROOT} -c set ssl.tls.version.min=${P4D_SSL_TLS_VERSION_MIN}"
+  gosu perforce p4d "${P4D_CASE_SENSITIVE_FLAG}" -r "${P4ROOT}" -c "set ssl.tls.version.min=${P4D_SSL_TLS_VERSION_MIN}"
 fi
 if [[ -n "${P4D_SSL_TLS_VERSION_MAX}" ]]; then
-  echo "Running: set ssl.tls.version.max=${P4D_SSL_TLS_VERSION_MAX}"
-  gosu perforce p4d -r "${P4ROOT}" -c "set ssl.tls.version.max=${P4D_SSL_TLS_VERSION_MAX}"
+  echo "Running: p4d ${P4D_CASE_SENSITIVE_FLAG} -r ${P4ROOT} -c set ssl.tls.version.max=${P4D_SSL_TLS_VERSION_MAX}"
+  gosu perforce p4d "${P4D_CASE_SENSITIVE_FLAG}" -r "${P4ROOT}" -c "set ssl.tls.version.max=${P4D_SSL_TLS_VERSION_MAX}"
 fi
diff --git a/helix-p4d/docker-startup.d/40-enable-unicode.sh b/helix-p4d/docker-startup.d/40-enable-unicode.sh
index d1d9e8d..67ab5ed 100755
--- a/helix-p4d/docker-startup.d/40-enable-unicode.sh
+++ b/helix-p4d/docker-startup.d/40-enable-unicode.sh
@@ -6,6 +6,6 @@ set -e
 # make sure that p4d is switched to unicode mode
 if [[ "${P4D_USE_UNICODE}" == "true" ]]; then
     if gosu perforce p4dctl list 2>/dev/null | grep -q "${P4NAME}"; then
-        gosu perforce p4d -xi -r "${P4ROOT}"
+        gosu perforce p4d "${P4D_CASE_SENSITIVE_FLAG}" -xi -r "${P4ROOT}"
     fi
 fi