diff --git a/changes/changelog.d/docker-nginx-entrypoint.bugfix b/changes/changelog.d/docker-nginx-entrypoint.bugfix
new file mode 100644
index 000000000..48c6e05c2
--- /dev/null
+++ b/changes/changelog.d/docker-nginx-entrypoint.bugfix
@@ -0,0 +1 @@
+Fix docker nginx entrypoint
diff --git a/docker/nginx/entrypoint.sh b/docker/nginx/entrypoint.sh
index 1839759c2..225eac359 100755
--- a/docker/nginx/entrypoint.sh
+++ b/docker/nginx/entrypoint.sh
@@ -2,10 +2,10 @@
 
 set -eux
 
-envsubst "$(env | awk -F = '{printf \" $$%s\", $$1}')" \
-  < /etc/nginx/nginx.conf.template \
-  > /etc/nginx/nginx.conf
+TEMPLATE_PATH="/etc/nginx/nginx.conf.template"
+CONFIG_PATH="/etc/nginx/nginx.conf"
 
-cat /etc/nginx/nginx.conf
+ALLOWED_VARS="$(env | cut -d '=' -f 1 | xargs printf "\${%s} ")"
+envsubst "$ALLOWED_VARS" < "$TEMPLATE_PATH" | tee "$CONFIG_PATH"
 
 nginx-debug -g 'daemon off;'