diff --git a/Dockerfile.unprivileged b/Dockerfile.unprivileged
index 87ffcce2..d7539f33 100644
--- a/Dockerfile.unprivileged
+++ b/Dockerfile.unprivileged
@@ -6,7 +6,8 @@
 FROM nginx-s3-gateway
 
 # Implement changes required to run NGINX as an unprivileged user
-RUN sed -i "/^server {/a \    listen       8080;" /etc/nginx/templates/default.conf.template \
+RUN sed -i 's/listen[[:space:]]*80;/listen 8080;/g' /etc/nginx/templates/default.conf.template \
+    && sed -i 's/listen[[:space:]]*\[::\]:80;/listen [::]:8080;/g' /etc/nginx/templates/default.conf.template \
     && sed -i '/user  nginx;/d' /etc/nginx/nginx.conf \
     && sed -i 's#http://127.0.0.1:80#http://127.0.0.1:8080#g' /etc/nginx/include/s3gateway.js \
     && sed -i 's,/var/run/nginx.pid,/tmp/nginx.pid,' /etc/nginx/nginx.conf \
diff --git a/common/etc/nginx/templates/default.conf.template b/common/etc/nginx/templates/default.conf.template
index 19c13cc9..4b65aa64 100644
--- a/common/etc/nginx/templates/default.conf.template
+++ b/common/etc/nginx/templates/default.conf.template
@@ -32,6 +32,8 @@ js_set $awsSessionToken awscredentials.sessionToken;
 js_set $s3uri s3gateway.s3uri;
 
 server {
+    listen       80;
+    listen       [::]:80;
     include /etc/nginx/conf.d/gateway/server_variables.conf;
 
     # Don't display the NGINX version number because we don't want to reveal