diff --git a/images/custom/Containerfile b/images/custom/Containerfile
index a35b93fe..16ca5f59 100644
--- a/images/custom/Containerfile
+++ b/images/custom/Containerfile
@@ -147,7 +147,7 @@ VOLUME [ \
 CMD [ \
   "/home/frappe/frappe-bench/env/bin/gunicorn", \
   "--chdir=/home/frappe/frappe-bench/sites", \
-  "--bind=0.0.0.0:8000", \
+  "--bind=[::]:8000", \
   "--threads=4", \
   "--workers=2", \
   "--worker-class=gthread", \
diff --git a/images/layered/Containerfile b/images/layered/Containerfile
index 12a089ee..da1ef1aa 100644
--- a/images/layered/Containerfile
+++ b/images/layered/Containerfile
@@ -47,7 +47,7 @@ VOLUME [ \
 CMD [ \
   "/home/frappe/frappe-bench/env/bin/gunicorn", \
   "--chdir=/home/frappe/frappe-bench/sites", \
-  "--bind=0.0.0.0:8000", \
+  "--bind=[::]:8000", \
   "--threads=4", \
   "--workers=2", \
   "--worker-class=gthread", \
diff --git a/images/production/Containerfile b/images/production/Containerfile
index 78c80f73..db550339 100644
--- a/images/production/Containerfile
+++ b/images/production/Containerfile
@@ -136,7 +136,7 @@ VOLUME [ \
 CMD [ \
   "/home/frappe/frappe-bench/env/bin/gunicorn", \
   "--chdir=/home/frappe/frappe-bench/sites", \
-  "--bind=0.0.0.0:8000", \
+  "--bind=[::]:8000", \
   "--threads=4", \
   "--workers=2", \
   "--worker-class=gthread", \
diff --git a/resources/nginx-template.conf b/resources/nginx-template.conf
index ded97c94..9b0eba1b 100644
--- a/resources/nginx-template.conf
+++ b/resources/nginx-template.conf
@@ -8,6 +8,8 @@ upstream socketio-server {
 
 server {
 	listen 8080;
+	listen [::]:8080;
+	
 	server_name ${FRAPPE_SITE_NAME_HEADER};
 	root /home/frappe/frappe-bench/sites;