diff --git a/ci-job-configs-sanity-check.yaml b/ci-job-configs-sanity-check.yaml
index 8989805..d45ce80 100644
--- a/ci-job-configs-sanity-check.yaml
+++ b/ci-job-configs-sanity-check.yaml
@@ -32,11 +32,11 @@
                 - patchset-created-event
             projects:
                 - project-compare-type: 'PLAIN'
-                  project-pattern: 'mbedtls/tf-ci-scripts'
+                  project-pattern: 'ci/mbedtls/tf-ci-scripts'
                   branches:
                     - branch-pattern: 'master'
                 - project-compare-type: 'PLAIN'
-                  project-pattern: 'mbedtls/mbed-tls-job-configs'
+                  project-pattern: 'ci/mbedtls/mbed-tls-job-configs'
                   branches:
                     - branch-pattern: 'master'
             silent-start: true
@@ -62,7 +62,7 @@
 
             cd configs/
 
-            mkdir -p ci/ && wget -q https://git.trustedfirmware.org/mbedtls/tf-ci-scripts.git/plain/ci/run-jjb.py -O ci/run-jjb.py
+            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
             # 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
diff --git a/trigger-ci-job-configs.yaml b/trigger-ci-job-configs.yaml
index e5dad58..be9877f 100644
--- a/trigger-ci-job-configs.yaml
+++ b/trigger-ci-job-configs.yaml
@@ -34,11 +34,11 @@
                 - change-merged-event
             projects:
                 - project-compare-type: 'PLAIN'
-                  project-pattern: 'mbedtls/tf-ci-scripts'
+                  project-pattern: 'ci/mbedtls/tf-ci-scripts'
                   branches:
                     - branch-pattern: 'master'
                 - project-compare-type: 'PLAIN'
-                  project-pattern: 'mbedtls/mbed-tls-job-configs'
+                  project-pattern: 'ci/mbedtls/mbed-tls-job-configs'
                   branches:
                     - branch-pattern: 'master'
             silent-start: true
@@ -79,7 +79,7 @@
             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/mbedtls/tf-ci-scripts.git/plain/ci/run-jjb.py -O ci/run-jjb.py
+            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
     publishers:
         - email: