diff --git a/script/docker/docker_exec.sh b/script/docker/docker_exec.sh
index d67a121..2167c29 100755
--- a/script/docker/docker_exec.sh
+++ b/script/docker/docker_exec.sh
@@ -7,4 +7,9 @@ BASENAME="${BASENAME//./}"
 # Lowercase
 BASENAME="${BASENAME,,}"
 
-docker exec -u root -ti ${BASENAME}_ERPLibre_1 bash
+docker exec -u root -ti ${BASENAME}-ERPLibre-1 bash
+
+retVal=$?
+if [[ $retVal -ne 0 ]]; then
+  docker exec -u root -ti ${BASENAME}_ERPLibre_1 bash
+fi
diff --git a/script/docker/docker_gen_config.sh b/script/docker/docker_gen_config.sh
index 5d7713d..262e226 100755
--- a/script/docker/docker_gen_config.sh
+++ b/script/docker/docker_gen_config.sh
@@ -7,7 +7,15 @@ BASENAME="${BASENAME//./}"
 # Lowercase
 BASENAME="${BASENAME,,}"
 
-docker exec -u root -ti ${BASENAME}_ERPLibre_1 /bin/bash -c "\
+docker exec -u root -ti ${BASENAME}-ERPLibre-1 /bin/bash -c "\
 cd /ERPLibre; \
 ./docker/repo_manifest_gen_org_prefix_path.py /ERPLibre/addons /etc/odoo/odoo.conf /etc/odoo/odoo.conf; \
 "
+
+retVal=$?
+if [[ $retVal -ne 0 ]]; then
+  docker exec -u root -ti ${BASENAME}_ERPLibre_1 /bin/bash -c "\
+  cd /ERPLibre; \
+  ./docker/repo_manifest_gen_org_prefix_path.py /ERPLibre/addons /etc/odoo/odoo.conf /etc/odoo/odoo.conf; \
+  "
+fi
\ No newline at end of file
diff --git a/script/docker/docker_list_database.sh b/script/docker/docker_list_database.sh
index e2f6160..518fc07 100755
--- a/script/docker/docker_list_database.sh
+++ b/script/docker/docker_list_database.sh
@@ -7,7 +7,15 @@ BASENAME="${BASENAME//./}"
 # Lowercase
 BASENAME="${BASENAME,,}"
 
-docker exec -u root -ti ${BASENAME}_ERPLibre_1 /bin/bash -c "\
+docker exec -u root -ti ${BASENAME}-ERPLibre-1 /bin/bash -c "\
 cd /ERPLibre; \
 time make db_list; \
 "
+
+retVal=$?
+if [[ $retVal -ne 0 ]]; then
+  docker exec -u root -ti ${BASENAME}_ERPLibre_1 /bin/bash -c "\
+  cd /ERPLibre; \
+  time make db_list; \
+  "
+fi
diff --git a/script/docker/docker_make_test.sh b/script/docker/docker_make_test.sh
index 9506239..4c26f3a 100755
--- a/script/docker/docker_make_test.sh
+++ b/script/docker/docker_make_test.sh
@@ -7,7 +7,15 @@ BASENAME="${BASENAME//./}"
 # Lowercase
 BASENAME="${BASENAME,,}"
 
-docker exec -u root -ti ${BASENAME}_ERPLibre_1 /bin/bash -c "\
+docker exec -u root -ti ${BASENAME}-ERPLibre-1 /bin/bash -c "\
 cd /ERPLibre; \
 time make test; \
 "
+
+retVal=$?
+if [[ $retVal -ne 0 ]]; then
+  docker exec -u root -ti ${BASENAME}_ERPLibre_1 /bin/bash -c "\
+  cd /ERPLibre; \
+  time make test; \
+  "
+fi
diff --git a/script/docker/docker_repo_show_status.sh b/script/docker/docker_repo_show_status.sh
index 10a4748..a080881 100755
--- a/script/docker/docker_repo_show_status.sh
+++ b/script/docker/docker_repo_show_status.sh
@@ -7,9 +7,19 @@ BASENAME="${BASENAME//./}"
 # Lowercase
 BASENAME="${BASENAME,,}"
 
-docker exec -u root -ti ${BASENAME}_ERPLibre_1 /bin/bash -c "\
+docker exec -u root -ti ${BASENAME}-ERPLibre-1 /bin/bash -c "\
 cd /ERPLibre; \
 ./.venv/repo forall -pc 'git status -s'; \
 echo ''; \
 git status -s; \
 "
+
+retVal=$?
+if [[ $retVal -ne 0 ]]; then
+  docker exec -u root -ti ${BASENAME}_ERPLibre_1 /bin/bash -c "\
+  cd /ERPLibre; \
+  ./.venv/repo forall -pc 'git status -s'; \
+  echo ''; \
+  git status -s; \
+  "
+fi