diff --git a/tools/ConfigDb/load_ConfigDb.sh b/tools/ConfigDb/load_ConfigDb.sh
index 9333f6814bb7c39f5aad4ee9d6b685a81fcdb782..e3fe552e1e6bcb709fe65f6cc89c0f1f5783769e 100755
--- a/tools/ConfigDb/load_ConfigDb.sh
+++ b/tools/ConfigDb/load_ConfigDb.sh
@@ -1,5 +1,9 @@
 if [ ${#} -ne 1 ]; then
     echo "You must provide a file name for the TANGO_HOST DB dump!"
     exit -1
+# Check if the filename begins with /hosthome:
+elif [ ${1##/hosthome/} != ${1//\/hosthome\//} ]; then
+    echo "You must provide a filename that begins with \"/hosthome/\".  Why is that?  Because the file needs to be stored from within the container to the hosts file system and your HOME directory will be mounted as /hosthome."
+    exit -2
 fi
-docker exec -it dsconfig json2tango --write ${1}
+docker exec -it ${TANGO_CONTAINER_ENV} dsconfig json2tango --write ${1}
diff --git a/tools/ConfigDb/update_ConfigDb.sh b/tools/ConfigDb/update_ConfigDb.sh
index 75081d3bda615aaf3b12aecdf329a0e3f61ac5ad..80febaecca78fcc9282c8ff7a38eb231feb529ce 100755
--- a/tools/ConfigDb/update_ConfigDb.sh
+++ b/tools/ConfigDb/update_ConfigDb.sh
@@ -1,5 +1,9 @@
 if [ ${#} -ne 1 ]; then
     echo "You must provide a file name for the TANGO_HOST DB dump!"
     exit -1
+# Check if the filename begins with /hosthome:
+elif [ ${1##/hosthome/} != ${1//\/hosthome\//} ]; then
+    echo "You must provide a filename that begins with \"/hosthome/\".  Why is that?  Because the file needs to be stored from within the container to the hosts file system and your HOME directory will be mounted as /hosthome."
+    exit -2
 fi
-docker exec -it dsconfig json2tango --update ${1}
+docker exec -it ${TANGO_CONTAINER_ENV} dsconfig json2tango --update ${1}