diff --git a/ci-job-configs-sanity-check.yaml b/ci-job-configs-sanity-check.yaml
index d45ce80..c433f71 100644
--- a/ci-job-configs-sanity-check.yaml
+++ b/ci-job-configs-sanity-check.yaml
@@ -52,7 +52,7 @@
         - shell: |
             #!/bin/bash
 
-            set -e
+            set -ex
 
             echo ""
             echo "########################################################################"
@@ -62,15 +62,15 @@
 
             cd configs/
 
-            mkdir -p ci/ && wget -q https://git.trustedfirmware.org/ci/mbedtls/tf-ci-scripts.git/plain/ci/run-jjb.py -O ci/run-jjb.py
+            git clone https://review.trustedfirmware.org/ci/mbedtls/tf-ci-scripts
             # FIXME run-jjb.py was meant to be used for deployment only
             # use JJB 'test' command instead of 'update' command
-            sed -i "s|update|test|" ci/run-jjb.py
+            sed -i "s|update|test|" tf-ci-scripts/ci/run-jjb.py
 
             export GIT_PREVIOUS_COMMIT=$(git rev-parse HEAD~1)
             export GIT_COMMIT=${GERRIT_PATCHSET_REVISION}
             jenkins-jobs --version
-            python3 ci/run-jjb.py
+            python3 tf-ci-scripts/ci/run-jjb.py
     publishers:
         - email:
             recipients: 'ben.copeland@linaro.org kelley.spoon@linaro.org arthur.she@linaro.org'
diff --git a/trigger-ci-job-configs.yaml b/trigger-ci-job-configs.yaml
index be9877f..270f6eb 100644
--- a/trigger-ci-job-configs.yaml
+++ b/trigger-ci-job-configs.yaml
@@ -66,7 +66,7 @@
         - shell: |
             #!/bin/bash
 
-            set -e
+            set -ex
 
             echo ""
             echo "########################################################################"
@@ -79,8 +79,8 @@
             export GIT_PREVIOUS_COMMIT=$(git rev-parse HEAD~1)
             export GIT_COMMIT=${GERRIT_PATCHSET_REVISION}
             jenkins-jobs --version
-            mkdir -p ci/ && wget -q https://git.trustedfirmware.org/ci/mbedtls/tf-ci-scripts.git/plain/ci/run-jjb.py -O ci/run-jjb.py
-            python3 ci/run-jjb.py
+            git clone https://review.trustedfirmware.org/ci/mbedtls/tf-ci-scripts
+            python3 tf-ci-scripts/ci/run-jjb.py
     publishers:
         - email:
             recipients: 'ben.copeland@linaro.org kelley.spoon@linaro.org arthur.she@linaro.org'