diff --git a/image-builder/image_builder.sh b/image-builder/image_builder.sh
index c9561754a5..99d0b27eee 100755
--- a/image-builder/image_builder.sh
+++ b/image-builder/image_builder.sh
@@ -6,13 +6,11 @@
 
 set -e
 
+[ -n "$DEBUG" ] && set -x
+
 script_name="${0##*/}"
 script_dir="$(dirname $(readlink -f $0))"
 
-if [ -n "$DEBUG" ] ; then
-	set -x
-fi
-
 SCRIPT_NAME="${0##*/}"
 IMAGE="${IMAGE:-kata-containers.img}"
 AGENT_BIN=${AGENT_BIN:-kata-agent}
diff --git a/initrd-builder/initrd_builder.sh b/initrd-builder/initrd_builder.sh
index ab8383dfcb..eef7c79378 100755
--- a/initrd-builder/initrd_builder.sh
+++ b/initrd-builder/initrd_builder.sh
@@ -6,13 +6,11 @@
 
 set -e
 
+[ -n "$DEBUG" ] && set -x
+
 script_name="${0##*/}"
 script_dir="$(dirname $(readlink -f $0))"
 
-if [ -n "$DEBUG" ] ; then
-	set -x
-fi
-
 SCRIPT_NAME="${0##*/}"
 INITRD_IMAGE="${INITRD_IMAGE:-kata-containers-initrd.img}"
 AGENT_BIN=${AGENT_BIN:-kata-agent}
diff --git a/rootfs-builder/rootfs.sh b/rootfs-builder/rootfs.sh
index 292bb89251..031142abd0 100755
--- a/rootfs-builder/rootfs.sh
+++ b/rootfs-builder/rootfs.sh
@@ -6,6 +6,8 @@
 
 set -e
 
+[ -n "$DEBUG" ] && set -x
+
 script_name="${0##*/}"
 script_dir="$(dirname $(readlink -f $0))"
 AGENT_VERSION=${AGENT_VERSION:-master}
@@ -26,10 +28,6 @@ typeset -r CONFIG_SH="config.sh"
 # Name of the extra file that could implement build_rootfs
 typeset -r LIB_SH="rootfs_lib.sh"
 
-if [ -n "$DEBUG" ] ; then
-	set -x
-fi
-
 #$1: Error code if want to exit differnt to 0
 usage(){
 	error="${1:-0}"