diff --git a/bootstrap/sbin/rebuild_system_from_scratch.sh b/bootstrap/sbin/rebuild_system_from_scratch.sh
index 9a651af5bceb0c4db7058a230403fa5e2782e2e7..8840c5a11d1863abe2e94cdda6268b9801d14d10 100755
--- a/bootstrap/sbin/rebuild_system_from_scratch.sh
+++ b/bootstrap/sbin/rebuild_system_from_scratch.sh
@@ -55,8 +55,12 @@ function start_minimal_tango()
 {
     (cd ${HOME_DIR}/docker-compose
     make minimal
+    # There is an issue with the dsconfig container that it every
+    # other time just exits without telling why.
+    # Therefore start dsconfig, then wait for 10s to allow it
+    # to die and just start it again.
+    # Don't they say that the second time is always a charm?
     make start dsconfig
-    # Just for good measure, wait a moment and start dsconfig again
     echo -e "\tWaiting for dsconfig to settle down..."
     sleep 10
     echo -e "\tDone.\n\tStarting dsconfig again."
@@ -65,10 +69,8 @@ function start_minimal_tango()
 
 function configure_tango_db()
 {
-    # This somehow returns with a non-0 return code.
-    set +e
-    ${HOME_DIR}/sbin/update_ConfigDb.sh ${HOME_DIR}/CDB/LOFAR_ConfigDb.json
-    set -e
+    # This somehow returns with a non-0 return code, make Bash happy.
+    ${HOME_DIR}/sbin/update_ConfigDb.sh ${HOME_DIR}/CDB/LOFAR_ConfigDb.json || true
 }
 
 function configure_elk()