diff --git a/.prod/nginx.conf b/.prod/nginx.conf
index c3663d10d..54089cd57 100644
--- a/.prod/nginx.conf
+++ b/.prod/nginx.conf
@@ -1,4 +1,4 @@
-pid        /tmp/nginx.pid; #for running as non-root 
+pid        /tmp/nginx.pid; #for running as non-root
 
 events {
     worker_connections  4096;  ## Default: 1024
@@ -10,10 +10,10 @@ http {
     fastcgi_temp_path     /tmp/fastcgi_temp;
     uwsgi_temp_path       /tmp/uwsgi_temp;
     scgi_temp_path        /tmp/scgi_temp;
-    
+
     include /etc/nginx/mime.types;
     default_type application/octet-stream;
-    
+
     server {
         listen       8080;
         server_name  localhost;
@@ -29,11 +29,12 @@ http {
         location / {
             root   /usr/share/nginx/html;
             try_files $uri /index.html;
+            include /etc/nginx/env/nginx_env.conf;
         }
 
         error_page   500 502 503 504  /50x.html;
         location = /50x.html {
             root   /usr/share/nginx/html;
         }
-    }        
+    }
 }
diff --git a/.prod/nginx_env.conf b/.prod/nginx_env.conf
new file mode 100644
index 000000000..1c9f2f6d3
--- /dev/null
+++ b/.prod/nginx_env.conf
@@ -0,0 +1,2 @@
+# This is a placeholder file for additional environment configuration
+# Actual content is defined by pipeline.
diff --git a/Dockerfile b/Dockerfile
index 5c6ee9777..be2ccd632 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -71,6 +71,8 @@ COPY --from=staticbuilder /app/build /usr/share/nginx/html
 
 # Copy nginx config
 COPY .prod/nginx.conf  /etc/nginx/
+RUN mkdir /etc/nginx/env
+COPY .prod/nginx_env.conf  /etc/nginx/env
 
 # Copy default environment config and setup script
 # Copy package.json so env.sh can read it