diff --git a/client/src/docker/completion.bash b/client/src/docker/completion.bash
index 6553cdb..04955e1 100644
--- a/client/src/docker/completion.bash
+++ b/client/src/docker/completion.bash
@@ -17,6 +17,14 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
+# WARNING: because of completion, the docker-finance environment file
+# is never read. Ergo, for debugging, you'll need to run the following:
+#
+# `export DOCKER_FINANCE_DEBUG=true && . ~/.bashrc`
+#
+# and then proceed to call `docker-finance` / `dfi` with your commands.
+[ "$DOCKER_FINANCE_DEBUG" == true ] && set -xv
+
# If not yet installed, gracefully exit
if ! hash docker &>/dev/null; then
exit 0
diff --git a/client/src/docker/docker.bash b/client/src/docker/docker.bash
index 952797b..2dbf6ab 100755
--- a/client/src/docker/docker.bash
+++ b/client/src/docker/docker.bash
@@ -156,6 +156,7 @@ function main()
#
lib_docker::docker "$@" || lib_utils::die_usage "$_usage"
+ [ "$DOCKER_FINANCE_DEBUG" == true ] && set -xv
#
# Command facade
diff --git a/container/src/finance/completion.bash b/container/src/finance/completion.bash
index 89e572c..b529c25 100644
--- a/container/src/finance/completion.bash
+++ b/container/src/finance/completion.bash
@@ -17,6 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
+[ "$DOCKER_FINANCE_DEBUG" == true ] && set -xv
[ -z "$DOCKER_FINANCE_CONTAINER_FLOW" ] && exit 1
function docker-finance::completion()
diff --git a/container/src/finance/finance.bash b/container/src/finance/finance.bash
index d2045bb..5e62b11 100755
--- a/container/src/finance/finance.bash
+++ b/container/src/finance/finance.bash
@@ -92,6 +92,7 @@ function main()
#
lib_finance::finance "$@" || lib_utils::die_usage "$_usage"
+ [ "$DOCKER_FINANCE_DEBUG" == true ] && set -xv
#
# Facade commands