diff --git a/contrib/docker/frontend-with-nginx/Dockerfile.dockerbuild b/contrib/docker/frontend-with-nginx/Dockerfile.dockerbuild
index dda9779eb0..41f931544f 100644
--- a/contrib/docker/frontend-with-nginx/Dockerfile.dockerbuild
+++ b/contrib/docker/frontend-with-nginx/Dockerfile.dockerbuild
@@ -51,9 +51,8 @@ FROM nginx:mainline
 RUN apt-get update && apt-get -y install jq && rm -rf /var/lib/apt/lists/*
 
 COPY --from=build /app/packages/app/dist /usr/share/nginx/html
-COPY docker/default.conf.template /etc/nginx/conf.d/default.conf.template
-COPY docker/run.sh /usr/local/bin/run.sh
+COPY docker/default.conf.template /etc/nginx/templates/default.conf.template
 
-CMD run.sh
+COPY docker/inject-config.sh /docker-entrypoint.d/40-inject-config.sh
 
 ENV PORT 80
diff --git a/contrib/docker/frontend-with-nginx/Dockerfile.hostbuild b/contrib/docker/frontend-with-nginx/Dockerfile.hostbuild
index 6e5912dd67..1e0134017f 100644
--- a/contrib/docker/frontend-with-nginx/Dockerfile.hostbuild
+++ b/contrib/docker/frontend-with-nginx/Dockerfile.hostbuild
@@ -33,9 +33,9 @@ FROM nginx:mainline
 RUN apt-get update && apt-get -y install jq && rm -rf /var/lib/apt/lists/*
 
 COPY packages/app/dist /usr/share/nginx/html
-COPY docker/default.conf.template /etc/nginx/conf.d/default.conf.template
-COPY docker/run.sh /usr/local/bin/run.sh
+COPY docker/default.conf.template /etc/nginx/templates/default.conf.template
 
-CMD run.sh
+COPY docker/inject-config.sh /docker-entrypoint.d/40-inject-config.sh
 
 ENV PORT 80
+
diff --git a/contrib/docker/frontend-with-nginx/docker/run.sh b/contrib/docker/frontend-with-nginx/docker/inject-config.sh
similarity index 80%
rename from contrib/docker/frontend-with-nginx/docker/run.sh
rename to contrib/docker/frontend-with-nginx/docker/inject-config.sh
index fdb1742a07..a0cea96ff3 100755
--- a/contrib/docker/frontend-with-nginx/docker/run.sh
+++ b/contrib/docker/frontend-with-nginx/docker/inject-config.sh
@@ -2,13 +2,6 @@
 
 set -Eeuo pipefail
 
-# Run nginx as root
-sed -i 's/user  nginx.*$//' /etc/nginx/nginx.conf
-
-# Write selected env vars to nginx config
-envsubst '$PORT' < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf
-
-# Inject runtime config into the client
 function inject_config() {
   # Read runtime config from env in the same way as the @backstage/config-loader package
   local config
@@ -41,4 +34,3 @@ function inject_config() {
 
 inject_config
 
-exec nginx -g 'daemon off;'