diff --git a/install_dehydrated.sh b/install_dehydrated.sh
index 9def551..eb49d6b 100755
--- a/install_dehydrated.sh
+++ b/install_dehydrated.sh
@@ -467,7 +467,7 @@ fi
 
 if [[ -n "$GITLAB_CONF_FILE" ]]; then
 
-   echononl "   Adjust GitLab Configuration (${GITLAB_CONF_FILE})"
+   echononl "   1. Adjust GitLab Configuration (${GITLAB_CONF_FILE})"
 
    if ! grep -E "^\s*nginx\['custom_gitlab_server_config'\]" $GITLAB_CONF_FILE 2> /dev/null | grep -q ".well-known/acme-challenge" 2> /dev/null ; then
       if !  grep -q -E "^\s*#\s*nginx\['custom_gitlab_server_config'\]" $GITLAB_CONF_FILE 2> /dev/null ; then
@@ -477,7 +477,7 @@ if [[ -n "$GITLAB_CONF_FILE" ]]; then
 ## Added by dehydrated install script $(basename $0)
 ################################################################################
 
-nginx['custom_gitlab_server_config'] = "location ^~ /.well-known/acme-challenge {\\n  alias /var/www/dehydrated;\\n  auth_basic off;\\n}\\n"
+nginx['custom_gitlab_server_config'] = "location ^~ /.well-known/acme-challenge {\\n    alias /var/www/dehydrated;\\n    auth_basic off;\\n  }\\n"
 
 EOF
          if [[ $? -eq 0 ]] ; then
@@ -498,6 +498,40 @@ EOF
    else
       echo_skipped
    fi
+
+   echononl "   2. Adjust GitLab Configuration (${GITLAB_CONF_FILE})"
+
+   if ! grep -E "^\s*nginx\['listen_addresses'\]" $GITLAB_CONF_FILE 2> /dev/null | grep -q -E "\['\*',\s*'\[::]'\]" 2> /dev/null ; then
+
+      if !  grep -q -E "^\s*#\s*nginx\['listen_addresses'\]" $GITLAB_CONF_FILE 2> /dev/null ; then
+         cat <<EOF >> ${GITLAB_CONF_FILE}
+
+################################################################################
+## Added by dehydrated install script $(basename $0)
+################################################################################
+
+nginx['listen_addresses'] = ['*', '[::]']
+
+EOF
+         if [[ $? -eq 0 ]] ; then
+            echo_ok
+            gitlab_reconfigure=true
+         else
+            echo_failed
+         fi
+      else
+         perl -i -n -p -e "s#^(\s*\#\s*(nginx\['listen_addresses'\]).*)#\1\n\2 = ['*', '[::]']#" $GITLAB_CONF_FILE
+         if [[ $? -eq 0 ]] ; then
+            echo_ok
+            gitlab_reconfigure=true
+         else
+            echo_failed
+         fi
+      fi
+   else
+      echo_skipped
+   fi
+
 fi