diff --git a/docs/airgap/scripts/deploy-images.sh b/docs/airgap/scripts/deploy-images.sh
index 684cab8c5da98c1e6ac122b3d9cbf284f8039ad6..181386e4aea62d621022b7f3c9d64d448775b43d 100644
--- a/docs/airgap/scripts/deploy-images.sh
+++ b/docs/airgap/scripts/deploy-images.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 set -e
+trap 'echo exit at ${0}:${LINENO}, command was: ${BASH_COMMAND} 1>&2' ERR
 
 REGISTRY_PACKAGE_IMAGE="registry:package"
 REGISTRY_PACKAGE_TGZ="${REGISTRY_PACKAGE_IMAGE}.tar.gz"
diff --git a/docs/airgap/scripts/package_images.sh b/docs/airgap/scripts/package_images.sh
index 1d67e3026c4954d8e1f4cb54f3c1f4dd7555fee4..a792acc82fe176897631815b0042e884b27072ef 100644
--- a/docs/airgap/scripts/package_images.sh
+++ b/docs/airgap/scripts/package_images.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 set -e
+trap 'echo exit at ${0}:${LINENO}, command was: ${BASH_COMMAND} 1>&2' ERR
 
 IMAGES_TXT="images.txt"
 REGISTRY_IMAGE="registry:2"
diff --git a/docs/airgap/scripts/registry.sh b/docs/airgap/scripts/registry.sh
index c277cd051b548eca3a93dd12c4fab2722e22b938..c69864cf6244f321ed0ce40ea0c3e7c8cef0ff62 100644
--- a/docs/airgap/scripts/registry.sh
+++ b/docs/airgap/scripts/registry.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -e
+trap 'echo exit at ${0}:${LINENO}, command was: ${BASH_COMMAND} 1>&2' ERR
 
 # Installs/Configures:
 #  - Docker Registy Container with self-signed cert
diff --git a/scripts/hosts.sh b/scripts/hosts.sh
index 6e033a257cbfcb54ff5c7eaff997417ee0edc2d1..393453906bcb198308440c2627fe58687ab1da03 100755
--- a/scripts/hosts.sh
+++ b/scripts/hosts.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -e
+trap 'echo exit at ${0}:${LINENO}, command was: ${BASH_COMMAND} 1>&2' ERR
 
 ## Adds all the vs hostnames and LB IP to /etc/hosts
 ## Get the LB Hostname
diff --git a/scripts/install_flux.sh b/scripts/install_flux.sh
index 59081267895119fa7909ca9183b3bc7f89686af1..339354f5b07d6a56a8e1992c93bf40483fe51c09 100755
--- a/scripts/install_flux.sh
+++ b/scripts/install_flux.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 set -e
+trap 'echo exit at ${0}:${LINENO}, command was: ${BASH_COMMAND} 1>&2' ERR
 
 #
 # global defaults
diff --git a/scripts/package/gits.sh b/scripts/package/gits.sh
index 44e0caec23802b3d10eb9070200feff40e6da14b..1ab383e5a785f99caf02e150fc646567f931005d 100755
--- a/scripts/package/gits.sh
+++ b/scripts/package/gits.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -ex
+trap 'echo exit at ${0}:${LINENO}, command was: ${BASH_COMMAND} 1>&2' ERR
 
 mkdir -p repos/
 
diff --git a/tests/ci/k3d/deploy_k3d.sh b/tests/ci/k3d/deploy_k3d.sh
index 0b436bfe92405ffb8210e49391d1af4e6868e6c3..eb184a964fde09a8e943f913fddf3e5eb2452638 100644
--- a/tests/ci/k3d/deploy_k3d.sh
+++ b/tests/ci/k3d/deploy_k3d.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 set -ex
+trap 'echo exit at ${0}:${LINENO}, command was: ${BASH_COMMAND} 1>&2' ERR
 # if keycloak label or all packages label add deploy k3d without loadbalancer so metallb can be used
 if [[ "${CI_COMMIT_BRANCH}" == "${CI_DEFAULT_BRANCH}" ]] || [[ ! -z "$CI_COMMIT_TAG" ]] || [[ $CI_MERGE_REQUEST_LABELS =~ "keycloak" ||  $CI_MERGE_REQUEST_LABELS =~ "all-packages" ]]; then
   k3d cluster create ${CI_JOB_ID} --config tests/ci/k3d/disable-servicelb-config.yaml --network ${CI_JOB_ID}
diff --git a/tests/ci/k3d/metallb/install_metallb.sh b/tests/ci/k3d/metallb/install_metallb.sh
index d60e34f550bb210f9640e7c0731129ce49804b9e..38b8d4871f059044f2c639e098f7c80e1dadaad7 100644
--- a/tests/ci/k3d/metallb/install_metallb.sh
+++ b/tests/ci/k3d/metallb/install_metallb.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 set -ex
+trap 'echo exit at ${0}:${LINENO}, command was: ${BASH_COMMAND} 1>&2' ERR
 
 if [[ "${CI_COMMIT_BRANCH}" == "${CI_DEFAULT_BRANCH}" ]] || [[ ! -z "$CI_COMMIT_TAG" ]] || [[ $CI_MERGE_REQUEST_LABELS =~ "keycloak" ||  $CI_MERGE_REQUEST_LABELS =~ "all-packages" ]]; then
   kubectl create -f tests/ci/k3d/metallb/metallb.yaml
diff --git a/tests/deploy/00_deploy_flux.sh b/tests/deploy/00_deploy_flux.sh
index 7c507dfe5634e7e349f4bccaf68a1128e8dacc00..2eb7acd800015a715baf5921a8987989d2e8e9a2 100644
--- a/tests/deploy/00_deploy_flux.sh
+++ b/tests/deploy/00_deploy_flux.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 set -ex
+trap 'echo exit at ${0}:${LINENO}, command was: ${BASH_COMMAND} 1>&2' ERR
 
 # install flux with the dedicated helper script
 ./scripts/install_flux.sh \
diff --git a/tests/deploy/01_deploy_bigbang.sh b/tests/deploy/01_deploy_bigbang.sh
index f048aa34be1c9e6decd21fa90c406a559f1dc622..9ff17762c9ff29a8d6079b5e24cc0da634aff8f7 100755
--- a/tests/deploy/01_deploy_bigbang.sh
+++ b/tests/deploy/01_deploy_bigbang.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 set -ex
+trap 'echo exit at ${0}:${LINENO}, command was: ${BASH_COMMAND} 1>&2' ERR
 
 if [[ "${CI_COMMIT_BRANCH}" == "${CI_DEFAULT_BRANCH}" ]] || [[ ! -z "$CI_COMMIT_TAG" ]] || [[ $CI_MERGE_REQUEST_LABELS =~ "all-packages" ]]; then
   echo "all-packages label enabled, or on default branch or tag, enabling all addons"
diff --git a/tests/deploy/02_wait_for_helmreleases.sh b/tests/deploy/02_wait_for_helmreleases.sh
index 7110d25765187a60f72c2bef93cec095bab27b66..9e6fe34d49c1de9d285bce0dc3390df580674fa0 100755
--- a/tests/deploy/02_wait_for_helmreleases.sh
+++ b/tests/deploy/02_wait_for_helmreleases.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 set -e
+trap 'echo exit at ${0}:${LINENO}, command was: ${BASH_COMMAND} 1>&2' ERR
 
 ## Array of core HRs
 CORE_HELMRELEASES=("gatekeeper" "istio-operator" "istio" "monitoring" "eck-operator" "ek" "fluent-bit" "twistlock" "cluster-auditor" "jaeger" "kiali")
diff --git a/tests/tests/01_virtualservices.sh b/tests/tests/01_virtualservices.sh
index c0d200472716e285c9b4550fd6d62d2c97189c71..466b104da1d4635508f19a52e9eadbc21236847b 100755
--- a/tests/tests/01_virtualservices.sh
+++ b/tests/tests/01_virtualservices.sh
@@ -2,6 +2,7 @@
 
 # exit on error
 set -e
+trap 'echo exit at ${0}:${LINENO}, command was: ${BASH_COMMAND} 1>&2' ERR
 
 # Populate /etc/hosts
 ip=$(kubectl -n istio-system get service public-ingressgateway -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
diff --git a/tests/tests/02_non_ironbank.sh b/tests/tests/02_non_ironbank.sh
index b67d7e81fc8e9bee34532b465ab94eb9bfe5fb34..110f09ccdc5711b2d310cf96fe9d8e64e6988f34 100755
--- a/tests/tests/02_non_ironbank.sh
+++ b/tests/tests/02_non_ironbank.sh
@@ -2,6 +2,7 @@
 
 # exit on error
 set -e
+trap 'echo exit at ${0}:${LINENO}, command was: ${BASH_COMMAND} 1>&2' ERR
 
 # Quick check for non iron bank images
 echo "Showing images not from ironbank:"
diff --git a/tests/tests/03_helm_tests.sh b/tests/tests/03_helm_tests.sh
index e91c99b27f48c0bc71c1a4bce0d65eb0ddbe16a6..d92fd6b0870ffb2ca2b110d794d4981a25990061 100755
--- a/tests/tests/03_helm_tests.sh
+++ b/tests/tests/03_helm_tests.sh
@@ -2,6 +2,7 @@
 
 # exit on error
 set -e
+trap 'echo exit at ${0}:${LINENO}, command was: ${BASH_COMMAND} 1>&2' ERR
 
 # Check clusterType and get original CoreDNS config
 clusterType="unknown"