diff --git a/README.md b/README.md
index bc2847f..c2d3cbb 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Docker image for Dolibarr with auto installer on first boot.
 * 9.0.4-php5.6 9.0.4-php7.3 9.0.4 9
 * 10.0.7-php5.6 10.0.7-php7.3 10.0.7 10
 * 11.0.5-php5.6 11.0.5-php7.4 11.0.5 11
-* 12.0.3-php5.6 12.0.3-php7.4 12.0.3 12 latest
+* 12.0.4-php5.6 12.0.4-php7.4 12.0.4 12 latest
 
 ## What is Dolibarr ?
 
diff --git a/images/10.0.7-php5.6/docker-run.sh b/images/10.0.7-php5.6/docker-run.sh
index 7295d76..50db99d 100755
--- a/images/10.0.7-php5.6/docker-run.sh
+++ b/images/10.0.7-php5.6/docker-run.sh
@@ -150,10 +150,11 @@ function migrateDatabase()
 function run()
 {
   initDolibarr
-  waitForDataBase
   echo "Current Version is : ${DOLI_VERSION}"
 
   if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ! -f /var/www/documents/install.lock ]]; then
+    waitForDataBase
+
     mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1
     r=$?
     if [[ ${r} -ne 0 ]]; then
diff --git a/images/10.0.7-php7.3/docker-run.sh b/images/10.0.7-php7.3/docker-run.sh
index 7295d76..50db99d 100755
--- a/images/10.0.7-php7.3/docker-run.sh
+++ b/images/10.0.7-php7.3/docker-run.sh
@@ -150,10 +150,11 @@ function migrateDatabase()
 function run()
 {
   initDolibarr
-  waitForDataBase
   echo "Current Version is : ${DOLI_VERSION}"
 
   if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ! -f /var/www/documents/install.lock ]]; then
+    waitForDataBase
+
     mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1
     r=$?
     if [[ ${r} -ne 0 ]]; then
diff --git a/images/11.0.5-php5.6/docker-run.sh b/images/11.0.5-php5.6/docker-run.sh
index 7295d76..50db99d 100755
--- a/images/11.0.5-php5.6/docker-run.sh
+++ b/images/11.0.5-php5.6/docker-run.sh
@@ -150,10 +150,11 @@ function migrateDatabase()
 function run()
 {
   initDolibarr
-  waitForDataBase
   echo "Current Version is : ${DOLI_VERSION}"
 
   if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ! -f /var/www/documents/install.lock ]]; then
+    waitForDataBase
+
     mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1
     r=$?
     if [[ ${r} -ne 0 ]]; then
diff --git a/images/11.0.5-php7.4/docker-run.sh b/images/11.0.5-php7.4/docker-run.sh
index 7295d76..50db99d 100755
--- a/images/11.0.5-php7.4/docker-run.sh
+++ b/images/11.0.5-php7.4/docker-run.sh
@@ -150,10 +150,11 @@ function migrateDatabase()
 function run()
 {
   initDolibarr
-  waitForDataBase
   echo "Current Version is : ${DOLI_VERSION}"
 
   if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ! -f /var/www/documents/install.lock ]]; then
+    waitForDataBase
+
     mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1
     r=$?
     if [[ ${r} -ne 0 ]]; then
diff --git a/images/12.0.3-php5.6/Dockerfile b/images/12.0.4-php5.6/Dockerfile
similarity index 98%
rename from images/12.0.3-php5.6/Dockerfile
rename to images/12.0.4-php5.6/Dockerfile
index 2011bff..6b49283 100644
--- a/images/12.0.3-php5.6/Dockerfile
+++ b/images/12.0.4-php5.6/Dockerfile
@@ -38,7 +38,7 @@ RUN apt-get update -y \
     && docker-php-ext-install -j$(nproc) ldap && \
     mv ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini
 
-ENV DOLI_VERSION 12.0.3
+ENV DOLI_VERSION 12.0.4
 
 # Get Dolibarr
 ADD https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.zip /tmp/dolibarr.zip
diff --git a/images/12.0.3-php5.6/docker-run.sh b/images/12.0.4-php5.6/docker-run.sh
similarity index 99%
rename from images/12.0.3-php5.6/docker-run.sh
rename to images/12.0.4-php5.6/docker-run.sh
index 7295d76..50db99d 100755
--- a/images/12.0.3-php5.6/docker-run.sh
+++ b/images/12.0.4-php5.6/docker-run.sh
@@ -150,10 +150,11 @@ function migrateDatabase()
 function run()
 {
   initDolibarr
-  waitForDataBase
   echo "Current Version is : ${DOLI_VERSION}"
 
   if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ! -f /var/www/documents/install.lock ]]; then
+    waitForDataBase
+
     mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1
     r=$?
     if [[ ${r} -ne 0 ]]; then
diff --git a/images/12.0.3-php7.4/Dockerfile b/images/12.0.4-php7.4/Dockerfile
similarity index 98%
rename from images/12.0.3-php7.4/Dockerfile
rename to images/12.0.4-php7.4/Dockerfile
index 006c8c9..bece4be 100644
--- a/images/12.0.3-php7.4/Dockerfile
+++ b/images/12.0.4-php7.4/Dockerfile
@@ -38,7 +38,7 @@ RUN apt-get update -y \
     && docker-php-ext-install -j$(nproc) ldap && \
     mv ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini
 
-ENV DOLI_VERSION 12.0.3
+ENV DOLI_VERSION 12.0.4
 
 # Get Dolibarr
 ADD https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.zip /tmp/dolibarr.zip
diff --git a/images/12.0.3-php7.4/docker-run.sh b/images/12.0.4-php7.4/docker-run.sh
similarity index 99%
rename from images/12.0.3-php7.4/docker-run.sh
rename to images/12.0.4-php7.4/docker-run.sh
index 7295d76..50db99d 100755
--- a/images/12.0.3-php7.4/docker-run.sh
+++ b/images/12.0.4-php7.4/docker-run.sh
@@ -150,10 +150,11 @@ function migrateDatabase()
 function run()
 {
   initDolibarr
-  waitForDataBase
   echo "Current Version is : ${DOLI_VERSION}"
 
   if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ! -f /var/www/documents/install.lock ]]; then
+    waitForDataBase
+
     mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1
     r=$?
     if [[ ${r} -ne 0 ]]; then
diff --git a/images/6.0.8-php5.6/docker-run.sh b/images/6.0.8-php5.6/docker-run.sh
index 7295d76..50db99d 100755
--- a/images/6.0.8-php5.6/docker-run.sh
+++ b/images/6.0.8-php5.6/docker-run.sh
@@ -150,10 +150,11 @@ function migrateDatabase()
 function run()
 {
   initDolibarr
-  waitForDataBase
   echo "Current Version is : ${DOLI_VERSION}"
 
   if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ! -f /var/www/documents/install.lock ]]; then
+    waitForDataBase
+
     mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1
     r=$?
     if [[ ${r} -ne 0 ]]; then
diff --git a/images/6.0.8-php7.1/docker-run.sh b/images/6.0.8-php7.1/docker-run.sh
index 7295d76..50db99d 100755
--- a/images/6.0.8-php7.1/docker-run.sh
+++ b/images/6.0.8-php7.1/docker-run.sh
@@ -150,10 +150,11 @@ function migrateDatabase()
 function run()
 {
   initDolibarr
-  waitForDataBase
   echo "Current Version is : ${DOLI_VERSION}"
 
   if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ! -f /var/www/documents/install.lock ]]; then
+    waitForDataBase
+
     mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1
     r=$?
     if [[ ${r} -ne 0 ]]; then
diff --git a/images/7.0.5-php5.6/docker-run.sh b/images/7.0.5-php5.6/docker-run.sh
index 7295d76..50db99d 100755
--- a/images/7.0.5-php5.6/docker-run.sh
+++ b/images/7.0.5-php5.6/docker-run.sh
@@ -150,10 +150,11 @@ function migrateDatabase()
 function run()
 {
   initDolibarr
-  waitForDataBase
   echo "Current Version is : ${DOLI_VERSION}"
 
   if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ! -f /var/www/documents/install.lock ]]; then
+    waitForDataBase
+
     mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1
     r=$?
     if [[ ${r} -ne 0 ]]; then
diff --git a/images/7.0.5-php7.2/docker-run.sh b/images/7.0.5-php7.2/docker-run.sh
index 7295d76..50db99d 100755
--- a/images/7.0.5-php7.2/docker-run.sh
+++ b/images/7.0.5-php7.2/docker-run.sh
@@ -150,10 +150,11 @@ function migrateDatabase()
 function run()
 {
   initDolibarr
-  waitForDataBase
   echo "Current Version is : ${DOLI_VERSION}"
 
   if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ! -f /var/www/documents/install.lock ]]; then
+    waitForDataBase
+
     mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1
     r=$?
     if [[ ${r} -ne 0 ]]; then
diff --git a/images/8.0.6-php5.6/docker-run.sh b/images/8.0.6-php5.6/docker-run.sh
index 7295d76..50db99d 100755
--- a/images/8.0.6-php5.6/docker-run.sh
+++ b/images/8.0.6-php5.6/docker-run.sh
@@ -150,10 +150,11 @@ function migrateDatabase()
 function run()
 {
   initDolibarr
-  waitForDataBase
   echo "Current Version is : ${DOLI_VERSION}"
 
   if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ! -f /var/www/documents/install.lock ]]; then
+    waitForDataBase
+
     mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1
     r=$?
     if [[ ${r} -ne 0 ]]; then
diff --git a/images/8.0.6-php7.2/docker-run.sh b/images/8.0.6-php7.2/docker-run.sh
index 7295d76..50db99d 100755
--- a/images/8.0.6-php7.2/docker-run.sh
+++ b/images/8.0.6-php7.2/docker-run.sh
@@ -150,10 +150,11 @@ function migrateDatabase()
 function run()
 {
   initDolibarr
-  waitForDataBase
   echo "Current Version is : ${DOLI_VERSION}"
 
   if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ! -f /var/www/documents/install.lock ]]; then
+    waitForDataBase
+
     mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1
     r=$?
     if [[ ${r} -ne 0 ]]; then
diff --git a/images/9.0.4-php5.6/docker-run.sh b/images/9.0.4-php5.6/docker-run.sh
index 7295d76..50db99d 100755
--- a/images/9.0.4-php5.6/docker-run.sh
+++ b/images/9.0.4-php5.6/docker-run.sh
@@ -150,10 +150,11 @@ function migrateDatabase()
 function run()
 {
   initDolibarr
-  waitForDataBase
   echo "Current Version is : ${DOLI_VERSION}"
 
   if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ! -f /var/www/documents/install.lock ]]; then
+    waitForDataBase
+
     mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1
     r=$?
     if [[ ${r} -ne 0 ]]; then
diff --git a/images/9.0.4-php7.3/docker-run.sh b/images/9.0.4-php7.3/docker-run.sh
index 7295d76..50db99d 100755
--- a/images/9.0.4-php7.3/docker-run.sh
+++ b/images/9.0.4-php7.3/docker-run.sh
@@ -150,10 +150,11 @@ function migrateDatabase()
 function run()
 {
   initDolibarr
-  waitForDataBase
   echo "Current Version is : ${DOLI_VERSION}"
 
   if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ! -f /var/www/documents/install.lock ]]; then
+    waitForDataBase
+
     mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1
     r=$?
     if [[ ${r} -ne 0 ]]; then
diff --git a/versions.sh b/versions.sh
index 45b2df0..a3430bf 100644
--- a/versions.sh
+++ b/versions.sh
@@ -2,4 +2,4 @@
 
 set -e
 
-DOLIBARR_VERSIONS=( "6.0.8" "7.0.5" "8.0.6" "9.0.4" "10.0.7" "11.0.5" "12.0.3" )
+DOLIBARR_VERSIONS=( "6.0.8" "7.0.5" "8.0.6" "9.0.4" "10.0.7" "11.0.5" "12.0.4" )