diff --git a/Dockerfile.template b/Dockerfile.template
index 6ffec2d..a86f21d 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -55,3 +55,5 @@ VOLUME /var/www/documents
 
 COPY docker-run.sh /usr/local/bin/
 ENTRYPOINT ["docker-run.sh"]
+
+CMD ["apache2-foreground"]
diff --git a/README.md b/README.md
index 3b0d2ee..bc2847f 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.2-php5.6 12.0.2-php7.4 12.0.2 12 latest
+* 12.0.3-php5.6 12.0.3-php7.4 12.0.3 12 latest
 
 ## What is Dolibarr ?
 
diff --git a/docker-run.sh b/docker-run.sh
index 21b86d9..7295d76 100755
--- a/docker-run.sh
+++ b/docker-run.sh
@@ -173,4 +173,10 @@ function run()
 
 run
 
-exec apache2-foreground
+set -e
+
+if [ "${1#-}" != "$1" ]; then
+  set -- apache2-foreground "$@"
+fi
+
+exec "$@"
diff --git a/images/10.0.7-php5.6/Dockerfile b/images/10.0.7-php5.6/Dockerfile
index 340d867..6726248 100644
--- a/images/10.0.7-php5.6/Dockerfile
+++ b/images/10.0.7-php5.6/Dockerfile
@@ -55,3 +55,5 @@ VOLUME /var/www/documents
 
 COPY docker-run.sh /usr/local/bin/
 ENTRYPOINT ["docker-run.sh"]
+
+CMD ["apache2-foreground"]
diff --git a/images/10.0.7-php5.6/docker-run.sh b/images/10.0.7-php5.6/docker-run.sh
index 21b86d9..7295d76 100755
--- a/images/10.0.7-php5.6/docker-run.sh
+++ b/images/10.0.7-php5.6/docker-run.sh
@@ -173,4 +173,10 @@ function run()
 
 run
 
-exec apache2-foreground
+set -e
+
+if [ "${1#-}" != "$1" ]; then
+  set -- apache2-foreground "$@"
+fi
+
+exec "$@"
diff --git a/images/10.0.7-php7.3/Dockerfile b/images/10.0.7-php7.3/Dockerfile
index a9a82c6..20b6c53 100644
--- a/images/10.0.7-php7.3/Dockerfile
+++ b/images/10.0.7-php7.3/Dockerfile
@@ -55,3 +55,5 @@ VOLUME /var/www/documents
 
 COPY docker-run.sh /usr/local/bin/
 ENTRYPOINT ["docker-run.sh"]
+
+CMD ["apache2-foreground"]
diff --git a/images/10.0.7-php7.3/docker-run.sh b/images/10.0.7-php7.3/docker-run.sh
index 21b86d9..7295d76 100755
--- a/images/10.0.7-php7.3/docker-run.sh
+++ b/images/10.0.7-php7.3/docker-run.sh
@@ -173,4 +173,10 @@ function run()
 
 run
 
-exec apache2-foreground
+set -e
+
+if [ "${1#-}" != "$1" ]; then
+  set -- apache2-foreground "$@"
+fi
+
+exec "$@"
diff --git a/images/11.0.5-php5.6/Dockerfile b/images/11.0.5-php5.6/Dockerfile
index 0bd2599..c5b1deb 100644
--- a/images/11.0.5-php5.6/Dockerfile
+++ b/images/11.0.5-php5.6/Dockerfile
@@ -55,3 +55,5 @@ VOLUME /var/www/documents
 
 COPY docker-run.sh /usr/local/bin/
 ENTRYPOINT ["docker-run.sh"]
+
+CMD ["apache2-foreground"]
diff --git a/images/11.0.5-php5.6/docker-run.sh b/images/11.0.5-php5.6/docker-run.sh
index 21b86d9..7295d76 100755
--- a/images/11.0.5-php5.6/docker-run.sh
+++ b/images/11.0.5-php5.6/docker-run.sh
@@ -173,4 +173,10 @@ function run()
 
 run
 
-exec apache2-foreground
+set -e
+
+if [ "${1#-}" != "$1" ]; then
+  set -- apache2-foreground "$@"
+fi
+
+exec "$@"
diff --git a/images/11.0.5-php7.4/Dockerfile b/images/11.0.5-php7.4/Dockerfile
index 07a18ec..29a46e1 100644
--- a/images/11.0.5-php7.4/Dockerfile
+++ b/images/11.0.5-php7.4/Dockerfile
@@ -55,3 +55,5 @@ VOLUME /var/www/documents
 
 COPY docker-run.sh /usr/local/bin/
 ENTRYPOINT ["docker-run.sh"]
+
+CMD ["apache2-foreground"]
diff --git a/images/11.0.5-php7.4/docker-run.sh b/images/11.0.5-php7.4/docker-run.sh
index 21b86d9..7295d76 100755
--- a/images/11.0.5-php7.4/docker-run.sh
+++ b/images/11.0.5-php7.4/docker-run.sh
@@ -173,4 +173,10 @@ function run()
 
 run
 
-exec apache2-foreground
+set -e
+
+if [ "${1#-}" != "$1" ]; then
+  set -- apache2-foreground "$@"
+fi
+
+exec "$@"
diff --git a/images/12.0.2-php5.6/Dockerfile b/images/12.0.3-php5.6/Dockerfile
similarity index 96%
rename from images/12.0.2-php5.6/Dockerfile
rename to images/12.0.3-php5.6/Dockerfile
index 636bc95..2011bff 100644
--- a/images/12.0.2-php5.6/Dockerfile
+++ b/images/12.0.3-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.2
+ENV DOLI_VERSION 12.0.3
 
 # Get Dolibarr
 ADD https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.zip /tmp/dolibarr.zip
@@ -55,3 +55,5 @@ VOLUME /var/www/documents
 
 COPY docker-run.sh /usr/local/bin/
 ENTRYPOINT ["docker-run.sh"]
+
+CMD ["apache2-foreground"]
diff --git a/images/12.0.2-php5.6/docker-run.sh b/images/12.0.3-php5.6/docker-run.sh
similarity index 98%
rename from images/12.0.2-php5.6/docker-run.sh
rename to images/12.0.3-php5.6/docker-run.sh
index 21b86d9..7295d76 100755
--- a/images/12.0.2-php5.6/docker-run.sh
+++ b/images/12.0.3-php5.6/docker-run.sh
@@ -173,4 +173,10 @@ function run()
 
 run
 
-exec apache2-foreground
+set -e
+
+if [ "${1#-}" != "$1" ]; then
+  set -- apache2-foreground "$@"
+fi
+
+exec "$@"
diff --git a/images/12.0.2-php7.4/Dockerfile b/images/12.0.3-php7.4/Dockerfile
similarity index 96%
rename from images/12.0.2-php7.4/Dockerfile
rename to images/12.0.3-php7.4/Dockerfile
index f6e670d..006c8c9 100644
--- a/images/12.0.2-php7.4/Dockerfile
+++ b/images/12.0.3-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.2
+ENV DOLI_VERSION 12.0.3
 
 # Get Dolibarr
 ADD https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.zip /tmp/dolibarr.zip
@@ -55,3 +55,5 @@ VOLUME /var/www/documents
 
 COPY docker-run.sh /usr/local/bin/
 ENTRYPOINT ["docker-run.sh"]
+
+CMD ["apache2-foreground"]
diff --git a/images/12.0.2-php7.4/docker-run.sh b/images/12.0.3-php7.4/docker-run.sh
similarity index 98%
rename from images/12.0.2-php7.4/docker-run.sh
rename to images/12.0.3-php7.4/docker-run.sh
index 21b86d9..7295d76 100755
--- a/images/12.0.2-php7.4/docker-run.sh
+++ b/images/12.0.3-php7.4/docker-run.sh
@@ -173,4 +173,10 @@ function run()
 
 run
 
-exec apache2-foreground
+set -e
+
+if [ "${1#-}" != "$1" ]; then
+  set -- apache2-foreground "$@"
+fi
+
+exec "$@"
diff --git a/images/6.0.8-php5.6/Dockerfile b/images/6.0.8-php5.6/Dockerfile
index 2f6ef5d..9cec58c 100644
--- a/images/6.0.8-php5.6/Dockerfile
+++ b/images/6.0.8-php5.6/Dockerfile
@@ -55,3 +55,5 @@ VOLUME /var/www/documents
 
 COPY docker-run.sh /usr/local/bin/
 ENTRYPOINT ["docker-run.sh"]
+
+CMD ["apache2-foreground"]
diff --git a/images/6.0.8-php5.6/docker-run.sh b/images/6.0.8-php5.6/docker-run.sh
index 21b86d9..7295d76 100755
--- a/images/6.0.8-php5.6/docker-run.sh
+++ b/images/6.0.8-php5.6/docker-run.sh
@@ -173,4 +173,10 @@ function run()
 
 run
 
-exec apache2-foreground
+set -e
+
+if [ "${1#-}" != "$1" ]; then
+  set -- apache2-foreground "$@"
+fi
+
+exec "$@"
diff --git a/images/6.0.8-php7.1/Dockerfile b/images/6.0.8-php7.1/Dockerfile
index 7271f39..7ca4171 100644
--- a/images/6.0.8-php7.1/Dockerfile
+++ b/images/6.0.8-php7.1/Dockerfile
@@ -55,3 +55,5 @@ VOLUME /var/www/documents
 
 COPY docker-run.sh /usr/local/bin/
 ENTRYPOINT ["docker-run.sh"]
+
+CMD ["apache2-foreground"]
diff --git a/images/6.0.8-php7.1/docker-run.sh b/images/6.0.8-php7.1/docker-run.sh
index 21b86d9..7295d76 100755
--- a/images/6.0.8-php7.1/docker-run.sh
+++ b/images/6.0.8-php7.1/docker-run.sh
@@ -173,4 +173,10 @@ function run()
 
 run
 
-exec apache2-foreground
+set -e
+
+if [ "${1#-}" != "$1" ]; then
+  set -- apache2-foreground "$@"
+fi
+
+exec "$@"
diff --git a/images/7.0.5-php5.6/Dockerfile b/images/7.0.5-php5.6/Dockerfile
index 0df563c..45db654 100644
--- a/images/7.0.5-php5.6/Dockerfile
+++ b/images/7.0.5-php5.6/Dockerfile
@@ -55,3 +55,5 @@ VOLUME /var/www/documents
 
 COPY docker-run.sh /usr/local/bin/
 ENTRYPOINT ["docker-run.sh"]
+
+CMD ["apache2-foreground"]
diff --git a/images/7.0.5-php5.6/docker-run.sh b/images/7.0.5-php5.6/docker-run.sh
index 21b86d9..7295d76 100755
--- a/images/7.0.5-php5.6/docker-run.sh
+++ b/images/7.0.5-php5.6/docker-run.sh
@@ -173,4 +173,10 @@ function run()
 
 run
 
-exec apache2-foreground
+set -e
+
+if [ "${1#-}" != "$1" ]; then
+  set -- apache2-foreground "$@"
+fi
+
+exec "$@"
diff --git a/images/7.0.5-php7.2/Dockerfile b/images/7.0.5-php7.2/Dockerfile
index 934fa65..6867ca8 100644
--- a/images/7.0.5-php7.2/Dockerfile
+++ b/images/7.0.5-php7.2/Dockerfile
@@ -55,3 +55,5 @@ VOLUME /var/www/documents
 
 COPY docker-run.sh /usr/local/bin/
 ENTRYPOINT ["docker-run.sh"]
+
+CMD ["apache2-foreground"]
diff --git a/images/7.0.5-php7.2/docker-run.sh b/images/7.0.5-php7.2/docker-run.sh
index 21b86d9..7295d76 100755
--- a/images/7.0.5-php7.2/docker-run.sh
+++ b/images/7.0.5-php7.2/docker-run.sh
@@ -173,4 +173,10 @@ function run()
 
 run
 
-exec apache2-foreground
+set -e
+
+if [ "${1#-}" != "$1" ]; then
+  set -- apache2-foreground "$@"
+fi
+
+exec "$@"
diff --git a/images/8.0.6-php5.6/Dockerfile b/images/8.0.6-php5.6/Dockerfile
index ce9ee8c..f80e7a9 100644
--- a/images/8.0.6-php5.6/Dockerfile
+++ b/images/8.0.6-php5.6/Dockerfile
@@ -55,3 +55,5 @@ VOLUME /var/www/documents
 
 COPY docker-run.sh /usr/local/bin/
 ENTRYPOINT ["docker-run.sh"]
+
+CMD ["apache2-foreground"]
diff --git a/images/8.0.6-php5.6/docker-run.sh b/images/8.0.6-php5.6/docker-run.sh
index 21b86d9..7295d76 100755
--- a/images/8.0.6-php5.6/docker-run.sh
+++ b/images/8.0.6-php5.6/docker-run.sh
@@ -173,4 +173,10 @@ function run()
 
 run
 
-exec apache2-foreground
+set -e
+
+if [ "${1#-}" != "$1" ]; then
+  set -- apache2-foreground "$@"
+fi
+
+exec "$@"
diff --git a/images/8.0.6-php7.2/Dockerfile b/images/8.0.6-php7.2/Dockerfile
index e0880fe..647b4bb 100644
--- a/images/8.0.6-php7.2/Dockerfile
+++ b/images/8.0.6-php7.2/Dockerfile
@@ -55,3 +55,5 @@ VOLUME /var/www/documents
 
 COPY docker-run.sh /usr/local/bin/
 ENTRYPOINT ["docker-run.sh"]
+
+CMD ["apache2-foreground"]
diff --git a/images/8.0.6-php7.2/docker-run.sh b/images/8.0.6-php7.2/docker-run.sh
index 21b86d9..7295d76 100755
--- a/images/8.0.6-php7.2/docker-run.sh
+++ b/images/8.0.6-php7.2/docker-run.sh
@@ -173,4 +173,10 @@ function run()
 
 run
 
-exec apache2-foreground
+set -e
+
+if [ "${1#-}" != "$1" ]; then
+  set -- apache2-foreground "$@"
+fi
+
+exec "$@"
diff --git a/images/9.0.4-php5.6/Dockerfile b/images/9.0.4-php5.6/Dockerfile
index d8e464e..0647a34 100644
--- a/images/9.0.4-php5.6/Dockerfile
+++ b/images/9.0.4-php5.6/Dockerfile
@@ -55,3 +55,5 @@ VOLUME /var/www/documents
 
 COPY docker-run.sh /usr/local/bin/
 ENTRYPOINT ["docker-run.sh"]
+
+CMD ["apache2-foreground"]
diff --git a/images/9.0.4-php5.6/docker-run.sh b/images/9.0.4-php5.6/docker-run.sh
index 21b86d9..7295d76 100755
--- a/images/9.0.4-php5.6/docker-run.sh
+++ b/images/9.0.4-php5.6/docker-run.sh
@@ -173,4 +173,10 @@ function run()
 
 run
 
-exec apache2-foreground
+set -e
+
+if [ "${1#-}" != "$1" ]; then
+  set -- apache2-foreground "$@"
+fi
+
+exec "$@"
diff --git a/images/9.0.4-php7.3/Dockerfile b/images/9.0.4-php7.3/Dockerfile
index 0d4b1ea..b258dba 100644
--- a/images/9.0.4-php7.3/Dockerfile
+++ b/images/9.0.4-php7.3/Dockerfile
@@ -55,3 +55,5 @@ VOLUME /var/www/documents
 
 COPY docker-run.sh /usr/local/bin/
 ENTRYPOINT ["docker-run.sh"]
+
+CMD ["apache2-foreground"]
diff --git a/images/9.0.4-php7.3/docker-run.sh b/images/9.0.4-php7.3/docker-run.sh
index 21b86d9..7295d76 100755
--- a/images/9.0.4-php7.3/docker-run.sh
+++ b/images/9.0.4-php7.3/docker-run.sh
@@ -173,4 +173,10 @@ function run()
 
 run
 
-exec apache2-foreground
+set -e
+
+if [ "${1#-}" != "$1" ]; then
+  set -- apache2-foreground "$@"
+fi
+
+exec "$@"
diff --git a/versions.sh b/versions.sh
index 0a04dc1..45b2df0 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.2" )
+DOLIBARR_VERSIONS=( "6.0.8" "7.0.5" "8.0.6" "9.0.4" "10.0.7" "11.0.5" "12.0.3" )