diff --git a/Dockerfile b/Dockerfile
index c3d8ab6..7b11821 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -169,6 +169,8 @@ RUN arch="$(uname -m)"; \
 
 EXPOSE ${PORT}
 
+ENV SIGNAL_CLI_CONFIG_DIR=/home/.local/share/signal-cli
+
 ENTRYPOINT ["/entrypoint.sh"]
 
 HEALTHCHECK --interval=20s --timeout=10s --retries=3 \
diff --git a/entrypoint.sh b/entrypoint.sh
index 8face63..41b4b68 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -3,7 +3,7 @@
 set -x
 set -e
 
-export SIGNAL_CLI_CONFIG_DIR=/home/.local/share/signal-cli
+[ -z "${SIGNAL_CLI_CONFIG_DIR}" ] && echo "SIGNAL_CLI_CONFIG_DIR environmental variable needs to be set! Aborting!" && exit 1;
 
 # Fix permissions to ensure backward compatibility
 chown 1000:1000 -R ${SIGNAL_CLI_CONFIG_DIR} 
@@ -19,4 +19,4 @@ cap_prefix="-cap_"
 caps="$cap_prefix$(seq -s ",$cap_prefix" 0 $(cat /proc/sys/kernel/cap_last_cap))"
 
 # Start API as signal-api user
-exec setpriv --reuid=1000 --regid=1000 --init-groups --inh-caps=$caps signal-cli-rest-api $@
+exec setpriv --reuid=1000 --regid=1000 --init-groups --inh-caps=$caps signal-cli-rest-api -signal-cli-config=${SIGNAL_CLI_CONFIG_DIR}