diff --git a/tools/qdrant_collect_stats.sh b/tools/qdrant_collect_stats.sh
index 7ccf9c29..8b81c9ad 100644
--- a/tools/qdrant_collect_stats.sh
+++ b/tools/qdrant_collect_stats.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+PS4='ts=$(date "+%Y-%m-%dT%H:%M:%SZ") level=DEBUG line=$LINENO file=$BASH_SOURCE '
+set -euo pipefail
 
 # Examples: qdrant-single-node, qdrant-single-node-rps
 CONTAINER_NAME=$1
diff --git a/tools/run_ci.sh b/tools/run_ci.sh
index f470da0c..b9b1113a 100644
--- a/tools/run_ci.sh
+++ b/tools/run_ci.sh
@@ -1,14 +1,15 @@
 #!/bin/bash
 
-set -e
+PS4='ts=$(date "+%Y-%m-%dT%H:%M:%SZ") level=DEBUG line=$LINENO file=$BASH_SOURCE '
+set -euo pipefail
 
 function handle_err() {
-  echo "Error occured ${QDRANT_VERSION@A} ${ENGINE_NAME@A} ${DATASETS@A}"
+  echo "Error occured qdrant_version=${QDRANT_VERSION} engine_name=${ENGINE_NAME} dataset=${DATASETS}"
   echo "{failed}={error}" >> $GITHUB_OUTPUT
 }
 
 function handle_term() {
-  echo "Timeout occured ${QDRANT_VERSION@A} ${ENGINE_NAME@A} ${DATASETS@A}"
+  echo "Timeout occured qdrant_version=${QDRANT_VERSION} engine_name=${ENGINE_NAME} dataset=${DATASETS}"
   echo "{failed}={timeout}" >> $GITHUB_OUTPUT
 }
 
diff --git a/tools/run_client_script.sh b/tools/run_client_script.sh
index 783ae793..da95da32 100644
--- a/tools/run_client_script.sh
+++ b/tools/run_client_script.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+PS4='ts=$(date "+%Y-%m-%dT%H:%M:%SZ") level=DEBUG line=$LINENO file=$BASH_SOURCE '
+set -euo pipefail
 
 CLOUD_NAME=${CLOUD_NAME:-"hetzner"}
 SERVER_USERNAME=${SERVER_USERNAME:-"root"}
diff --git a/tools/run_experiment.sh b/tools/run_experiment.sh
index 6179b88b..0ee29375 100644
--- a/tools/run_experiment.sh
+++ b/tools/run_experiment.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+PS4='ts=$(date "+%Y-%m-%dT%H:%M:%SZ") level=DEBUG line=$LINENO file=$BASH_SOURCE '
+set -euo pipefail
 
 ENGINE_NAME=${ENGINE_NAME:-"qdrant-continuous-benchmark"}
 
diff --git a/tools/run_remote_benchmark.sh b/tools/run_remote_benchmark.sh
index bcba6a23..26ae75da 100644
--- a/tools/run_remote_benchmark.sh
+++ b/tools/run_remote_benchmark.sh
@@ -1,12 +1,13 @@
 #!/bin/bash
 
-set -e
+PS4='ts=$(date "+%Y-%m-%dT%H:%M:%SZ") level=DEBUG line=$LINENO file=$BASH_SOURCE '
+set -euo pipefail
 
 # Setup 2 machines in Hetzner Cloud
 # One machine will be used as a server, another one as a client
 
 cleanup() {
-  echo "cleaning up..."
+  echo "cleaning up file=$BASH_SOURCE"
   #  bash -x "${SCRIPT_PATH}/tear_down.sh"
 }
 
diff --git a/tools/run_server_container.sh b/tools/run_server_container.sh
index d04f1199..c28e145c 100644
--- a/tools/run_server_container.sh
+++ b/tools/run_server_container.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+PS4='ts=$(date "+%Y-%m-%dT%H:%M:%SZ") level=DEBUG line=$LINENO file=$BASH_SOURCE '
+set -euo pipefail
 
 # Examples: qdrant-continuous-benchmarks
 CONTAINER_NAME=$1