diff --git a/docker/images/files/nginx-resolvers.conf.template b/docker/images/files/nginx-resolvers.conf.template
index 75e1405734..483f2714da 100644
--- a/docker/images/files/nginx-resolvers.conf.template
+++ b/docker/images/files/nginx-resolvers.conf.template
@@ -1 +1 @@
-resolver $PENPOT_INTERNAL_RESOLVER ipv6=off valid=10s;
+resolver $PENPOT_INTERNAL_RESOLVER valid=10s;
diff --git a/docker/images/files/nginx.conf.template b/docker/images/files/nginx.conf.template
index b5a8605959..1fefceec74 100644
--- a/docker/images/files/nginx.conf.template
+++ b/docker/images/files/nginx.conf.template
@@ -73,6 +73,7 @@ http {
 
     server {
         listen 8080 default_server;
+        listen [::]:8080 default_server;
         server_name _;
 
         client_max_body_size $PENPOT_HTTP_SERVER_MAX_MULTIPART_BODY_SIZE;