diff --git a/helpers.sh b/helpers.sh
index c5acc749..ce1cbb16 100644
--- a/helpers.sh
+++ b/helpers.sh
@@ -1,6 +1,7 @@
 # Common helper functions for all scripts
 
 set -o pipefail
+[ "${CI_SCRIPT_DEBUG-0}" = "1" ] && set -x
 
 function indent { sed 's/^/|  /'; echo "|--" ;}
 function status { echo == $(date "+%F %T") $* ; }
diff --git a/lmp/bb-config.sh b/lmp/bb-config.sh
index d439060f..4edeb563 100755
--- a/lmp/bb-config.sh
+++ b/lmp/bb-config.sh
@@ -22,6 +22,8 @@ FIO_PUSH_BIN="${FIO_PUSH_BIN-/usr/bin/fiopush}"
 FIO_CHECK_BIN="${FIO_CHECK_BIN-/usr/bin/fiocheck}"
 OSTREE_API_VERSION="${OSTREE_API_VERSION-v2}"
 DEV_MODE="${DEV_MODE-0}"
+# Enable bash trace mode (set -x) for debugging ci-scripts
+CI_SCRIPT_DEBUG="${CI_SCRIPT_DEBUG-0}"
 BUILD_SDK="${BUILD_SDK-0}"
 LMP_ROLLBACK_PROTECTION_ENABLE="${LMP_ROLLBACK_PROTECTION_ENABLE-0}"
 DISABLE_LOGCONFIG="${DISABLE_LOGCONFIG-0}"
diff --git a/lmp/bb-selftest.sh b/lmp/bb-selftest.sh
index d1a1acce..ece3f286 100755
--- a/lmp/bb-selftest.sh
+++ b/lmp/bb-selftest.sh
@@ -1,5 +1,7 @@
 #!/bin/bash -e
 
+[ "${CI_SCRIPT_DEBUG-0}" = "1" ] && set -x
+
 source setup-environment build
 
 # The oe-selftest reproducible is build in two step (A and B) and sharing