diff --git a/.ci/scripts/coverity.sh b/.ci/scripts/coverity.sh
index 25e4d26f76..7c94a90ab0 100755
--- a/.ci/scripts/coverity.sh
+++ b/.ci/scripts/coverity.sh
@@ -140,8 +140,10 @@ function main() {
     fi
 
     echo "Uploading to synopsys main coverity server"
+    set +x -v
     cov-commit-defects --ssl --on-new-cert trust --host coverity.mellanox.com --port 8443 \
     --user "${UCC_USERNAME}" --password "${UCC_PASSWORD}" --dir "$COV_BUILD_DIR" --stream ucc_master
+    set +v -x
     return 0
 }
 
diff --git a/.ci/scripts/enroot_setup.sh b/.ci/scripts/enroot_setup.sh
index 843519d8df..d734e08886 100755
--- a/.ci/scripts/enroot_setup.sh
+++ b/.ci/scripts/enroot_setup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -xe
+#!/bin/bash -ve
 
 # Configure enroot credentials if provided
 if [[ -n "${ENROOT_USERNAME}" && -n "${ENROOT_PASSWORD}" ]]; then