diff --git a/8/mysql-tomcat/Dockerfile b/8/mysql-tomcat/Dockerfile
index f90f1e20f345b53e8780c1edc3b3743c045c89ce..b840ce19f88b9a75bfcdac266cea60112bee6aba 100644
--- a/8/mysql-tomcat/Dockerfile
+++ b/8/mysql-tomcat/Dockerfile
@@ -81,8 +81,8 @@ VOLUME /usr/local/xwiki
 #                configure xwiki's hibernate.cfg.xml file.
 # - DB_DATABASE: the name of the database to use. Default is "xwiki". This is used to configure xwiki's
 #                hibernate.cfg.xml file.
-# - DB_CONTAINER: The name of the docker container containing the database. Default is "db". This is used to
-#                 configure xwiki's hibernate.cfg.xml file.
+# - DB_HOST: The name of the host (or docker container) containing the database. Default is "db". This is used to
+#            configure xwiki's hibernate.cfg.xml file.
 
 # Example:
 #   docker run -it -e "DB_USER=xwiki" -e "DB_PASSWORD=xwiki" <imagename>
diff --git a/8/mysql-tomcat/docker-compose.yml b/8/mysql-tomcat/docker-compose.yml
index d29f36731dec6f47e26f74811dc82e4518c43e3d..6cf2f2934130e0a63b973d403d4086358d5d8303 100644
--- a/8/mysql-tomcat/docker-compose.yml
+++ b/8/mysql-tomcat/docker-compose.yml
@@ -31,13 +31,13 @@ services:
     ports:
       - "8080:8080"
     # Default values defined in .env file.
-    # The DB_USER/DB_PASSWORD/DB_DATABASE/DB_CONTAINER variables are used in the hibernate.cfg.xml file.
+    # The DB_USER/DB_PASSWORD/DB_DATABASE/DB_HOST variables are used in the hibernate.cfg.xml file.
     environment:
       - XWIKI_VERSION=${XWIKI_VERSION}
       - DB_USER=${DB_USER}
       - DB_PASSWORD=${DB_PASSWORD}
       - DB_DATABASE=${DB_DATABASE}
-      - DB_CONTAINER=xwiki-mysql
+      - DB_HOST=xwiki-mysql
     # Provide a name instead of an auto-generated id for xwiki data (the permanent directory in included in it)
     # configured in the Dockerfile, to make it simpler to identify in 'docker volume ls'.
     volumes:
diff --git a/8/mysql-tomcat/xwiki/docker-entrypoint.sh b/8/mysql-tomcat/xwiki/docker-entrypoint.sh
index c918feb99f5bcdc7b11b29679757d502b1d1a667..753c1043373d2d5ceff1b8574e921a8227cb1b1e 100755
--- a/8/mysql-tomcat/xwiki/docker-entrypoint.sh
+++ b/8/mysql-tomcat/xwiki/docker-entrypoint.sh
@@ -49,7 +49,7 @@ function configure() {
   echo 'Configuring XWiki...'
   sed -i "s/replaceuser/${DB_USER:-xwiki}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/hibernate.cfg.xml
   sed -i "s/replacepassword/${DB_PASSWORD:-xwiki}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/hibernate.cfg.xml
-  sed -i "s/replacecontainer/${DB_CONTAINER:-db}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/hibernate.cfg.xml
+  sed -i "s/replacecontainer/${DB_HOST:-db}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/hibernate.cfg.xml
   sed -i "s/replacedatabase/${DB_DATABASE:-xwiki}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/hibernate.cfg.xml
 
   echo '  Using filesystem-based attachments...'
diff --git a/README.md b/README.md
index b2c6716f90d1a9b50472ed6a10c57de52073076f..75e00f4ee9f084165e1a8c7ccc30360f38ee760b 100644
--- a/README.md
+++ b/README.md
@@ -50,10 +50,10 @@ You should adapt the command line to use the passwords that you wish for the MyS
 Then run XWiki in another container by issuing the following command:
 
 ```console
-docker run --net=xwiki-nw --name xwiki -p 8080:8080 -v /my/own/xwiki:/usr/local/xwiki -e DB_USER=xwiki -e DB_PASSWORD=xwiki -e DB_DATABASE=xwiki -e DB_CONTAINER=mysql-xwiki xwiki:mysql-tomcat
+docker run --net=xwiki-nw --name xwiki -p 8080:8080 -v /my/own/xwiki:/usr/local/xwiki -e DB_USER=xwiki -e DB_PASSWORD=xwiki -e DB_DATABASE=xwiki -e DB_HOST=mysql-xwiki xwiki:mysql-tomcat
 ```
 
-Be careful to use the same MySQL username, password and database names that you've used on the first command to start the MySQL container. Also, please don't forget to add a `-e DB_CONTAINER=` environment variable with the name of the previously created MySQL container so that XWiki knows where its database is.
+Be careful to use the same MySQL username, password and database names that you've used on the first command to start the MySQL container. Also, please don't forget to add a `-e DB_HOST=` environment variable with the name of the previously created MySQL container so that XWiki knows where its database is.
 
 At this point, XWiki should start in interactive blocking mode, allowing you to see logs in the console. Should you wish to run it in "detached mode", just add a "-d" flag in the previous command.
 
@@ -89,7 +89,7 @@ services:
     environment:
       - DB_USER=xwiki
       - DB_PASSWORD=xwiki
-      - DB_CONTAINER=xwiki-mysql
+      - DB_HOST=xwiki-mysql
     volumes:
       - xwiki-data:/usr/local/xwiki
     networks:
@@ -135,7 +135,7 @@ The first time you create a container out of the xwiki image, a shell script (`/
 -	`DB_USER`: The user name used by XWiki to read/write to the DB.
 -	`DB_PASSWORD`: The user password used by XWiki to read/write to the DB.
 -	`DB_DATABASE`: The name of the XWiki database to use/create.
--	`DB_CONTAINER`: The name of the docker container used to run the DB.
+-	`DB_HOST`: The name of the host (or docker container) containing the database. Default is "db".
 
 ## Miscellaneous
 
diff --git a/docker-compose-using.yml b/docker-compose-using.yml
index 31c12d714521a4cb6330bafeebe8e856fe1ea7a9..5ea883b5bcfc4f8beb8ff88b2efb65aa55c38fd4 100644
--- a/docker-compose-using.yml
+++ b/docker-compose-using.yml
@@ -30,12 +30,12 @@ services:
       - db
     ports:
       - "8080:8080"
-    # The DB_USER/DB_PASSWORD/DB_CONTAINER variables are used in the hibernate.cfg.xml file.
+    # The DB_USER/DB_PASSWORD/DB_HOST variables are used in the hibernate.cfg.xml file.
     environment:
       - DB_USER=xwiki
       - DB_PASSWORD=xwiki
       - DB_DATABASE=xwiki
-      - DB_CONTAINER=xwiki-mysql
+      - DB_HOST=xwiki-mysql
     # Provide a name instead of an auto-generated id for the xwiki permanent directory configured in the Dockerfile,
     # to make it simpler to identify in 'docker volume ls'.
     volumes:
diff --git a/template/Dockerfile b/template/Dockerfile
index 91f09bb5403c72bec670f91f353396477446b458..826478f0b3efb5401928f3a85d053a26766e971f 100644
--- a/template/Dockerfile
+++ b/template/Dockerfile
@@ -85,8 +85,8 @@ VOLUME /usr/local/xwiki
 #                configure xwiki's hibernate.cfg.xml file.
 # - DB_DATABASE: the name of the database to use. Default is "xwiki". This is used to configure xwiki's
 #                hibernate.cfg.xml file.
-# - DB_CONTAINER: The name of the docker container containing the database. Default is "db". This is used to
-#                 configure xwiki's hibernate.cfg.xml file.
+# - DB_HOST: The name of the host (or docker container) containing the database. Default is "db". This is used to
+#            configure xwiki's hibernate.cfg.xml file.
 
 # Example:
 #   docker run -it -e "DB_USER=xwiki" -e "DB_PASSWORD=xwiki" <imagename>
diff --git a/template/docker-compose.yml b/template/docker-compose.yml
index a75b8c05451739cee08323c1ee2e1aa88f6e9015..8a933f05b9c9d87c90565ae95495244a742068d6 100644
--- a/template/docker-compose.yml
+++ b/template/docker-compose.yml
@@ -31,13 +31,13 @@ services:
     ports:
       - "8080:8080"
     # Default values defined in .env file.
-    # The DB_USER/DB_PASSWORD/DB_DATABASE/DB_CONTAINER variables are used in the hibernate.cfg.xml file.
+    # The DB_USER/DB_PASSWORD/DB_DATABASE/DB_HOST variables are used in the hibernate.cfg.xml file.
     environment:
       - XWIKI_VERSION=\${XWIKI_VERSION}
       - DB_USER=\${DB_USER}
       - DB_PASSWORD=\${DB_PASSWORD}
       - DB_DATABASE=\${DB_DATABASE}
-      - DB_CONTAINER=xwiki-mysql
+      - DB_HOST=xwiki-mysql
     # Provide a name instead of an auto-generated id for xwiki data (the permanent directory in included in it)
     # configured in the Dockerfile, to make it simpler to identify in 'docker volume ls'.
     volumes:
diff --git a/template/xwiki/docker-entrypoint.sh b/template/xwiki/docker-entrypoint.sh
index 25c7bc26550ec7ad44ee3c51d25760b1d20d5947..2eb18ce2f68611de712755803b5c16878da7b5e7 100755
--- a/template/xwiki/docker-entrypoint.sh
+++ b/template/xwiki/docker-entrypoint.sh
@@ -49,7 +49,7 @@ function configure() {
   echo 'Configuring XWiki...'
   sed -i "s/replaceuser/\${DB_USER:-xwiki}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/hibernate.cfg.xml
   sed -i "s/replacepassword/\${DB_PASSWORD:-xwiki}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/hibernate.cfg.xml
-  sed -i "s/replacecontainer/\${DB_CONTAINER:-db}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/hibernate.cfg.xml
+  sed -i "s/replacecontainer/\${DB_HOST:-db}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/hibernate.cfg.xml
   sed -i "s/replacedatabase/\${DB_DATABASE:-xwiki}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/hibernate.cfg.xml
 
   echo '  Using filesystem-based attachments...'