diff --git a/README.md b/README.md
index df5a1f1d31b679169e5b70605b35533516268f13..c82325c321e9207acc4f44fe8d306e3c659258b8 100644
--- a/README.md
+++ b/README.md
@@ -73,11 +73,11 @@ services:
       - db
     ports:
       - "8080:8080"
-    volumes:
-      - xwiki-data:/usr/local/xwiki
     environment:
       - MYSQL_USER=xwiki
       - MYSQL_PASSWORD=xwiki
+    volumes:
+      - xwiki-data:/usr/local/xwiki
   db:
     image: "mysql:5.7"
     volumes:
diff --git a/xwiki-mysql-tomcat/docker-compose-using.yml b/xwiki-mysql-tomcat/docker-compose-using.yml
index 7f67467eeec0064e6a0ad812e4f92c4a1189f60b..da20410845b2b9c8bd591525d830499c2e10d38a 100644
--- a/xwiki-mysql-tomcat/docker-compose-using.yml
+++ b/xwiki-mysql-tomcat/docker-compose-using.yml
@@ -27,11 +27,10 @@ services:
       - db
     ports:
       - "8080:8080"
-    # The MYSQL_USER/MYSQL_PASSWORD/MYSQL_DATABASE variables are used in the hibernate.cfg.xml file.
+    # The MYSQL_USER/MYSQL_PASSWORD variables are used in the hibernate.cfg.xml file.
     environment:
       - MYSQL_USER=xwiki
       - MYSQL_PASSWORD=xwiki
-      - MYSQL_DATABASE=xwiki
     # 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/xwiki-mysql-tomcat/xwiki/docker-entrypoint.sh b/xwiki-mysql-tomcat/xwiki/docker-entrypoint.sh
index a1f9367b7bf8a96e0cd5f21f3946ecb7a3f4a18c..de51cef7e5308045629917d8c75668be922d9c7c 100755
--- a/xwiki-mysql-tomcat/xwiki/docker-entrypoint.sh
+++ b/xwiki-mysql-tomcat/xwiki/docker-entrypoint.sh
@@ -47,7 +47,7 @@ function xwiki_set_properties() {
 
 function configure() {
   echo 'Configuring XWiki...'
-  sed -i "s/replacemysqluser/${MYSQL_USERNAME:-xwiki}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/hibernate.cfg.xml
+  sed -i "s/replacemysqluser/${MYSQL_USER:-xwiki}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/hibernate.cfg.xml
   sed -i "s/replacemysqlpassword/${MYSQL_PASSWORD:-xwiki}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/hibernate.cfg.xml
 
   echo '  Using filesystem-based attachments...'