diff --git a/docker/build/internal_files/clearml.conf.template b/docker/build/internal_files/clearml.conf.template
index 81a9aab..b25866d 100644
--- a/docker/build/internal_files/clearml.conf.template
+++ b/docker/build/internal_files/clearml.conf.template
@@ -37,7 +37,7 @@ http {
 
     server {
         listen       80 default_server;
-        listen       [::]:80 default_server;
+        ${COMMENT_IPV6_LISTEN}listen       [::]:80 default_server;
         server_name  _;
         root         /usr/share/nginx/html;
         proxy_http_version 1.1;
diff --git a/docker/build/internal_files/entrypoint.sh b/docker/build/internal_files/entrypoint.sh
index b62f17c..3c3507d 100644
--- a/docker/build/internal_files/entrypoint.sh
+++ b/docker/build/internal_files/entrypoint.sh
@@ -48,7 +48,8 @@ EOF
 
     export NGINX_APISERVER_ADDR=${NGINX_APISERVER_ADDRESS:-http://apiserver:8008}
     export NGINX_FILESERVER_ADDR=${NGINX_FILESERVER_ADDRESS:-http://fileserver:8081}
-    envsubst '${NGINX_APISERVER_ADDR} ${NGINX_FILESERVER_ADDR}' < /etc/nginx/clearml.conf.template > /etc/nginx/nginx.conf
+    COMMENT_IPV6_LISTEN=$([ "$DISABLE_NGINX_IPV6" = "true" ] && echo "#" || echo "") \
+     envsubst '${COMMENT_IPV6_LISTEN} ${NGINX_APISERVER_ADDR} ${NGINX_FILESERVER_ADDR}' < /etc/nginx/clearml.conf.template > /etc/nginx/nginx.conf
 
     if [[ -n "${CLEARML_SERVER_SUB_PATH}" ]]; then
       envsubst '${CLEARML_SERVER_SUB_PATH}' < /etc/nginx/clearml_subpath.conf.template > /etc/nginx/default.d/clearml_subpath.conf