diff --git a/tf-m-eclair-daily.yaml b/tf-m-eclair-daily.yaml
index 96c8c93..3675ea6 100644
--- a/tf-m-eclair-daily.yaml
+++ b/tf-m-eclair-daily.yaml
@@ -101,6 +101,17 @@
           name: 'TFM_TESTS_REFSPEC'
           default: ''
       - string:
+          name: 'TFM_EXTRAS_URL'
+          default: 'https://git.trustedfirmware.org/TF-M/tf-m-extras.git'
+      - string:
+          name: 'TFM_EXTRAS_REFSPEC'
+          default: ''
+          description: |
+            Specify which tf-m-extras version to use
+            refs/heads/<branch_name> : Pick up latest HEAD on branch
+            TAG_NAME                 : Pick up a tagged version
+            full commit hash         : Pick up a specific commit
+      - string:
           name: 'PSA_ARCH_TESTS_URL'
           default: 'https://git.trustedfirmware.org/mirror/psa-arch-tests.git'
       - string:
diff --git a/tf-m-eclair-delta.yaml b/tf-m-eclair-delta.yaml
index 9e7cf2d..7105556 100644
--- a/tf-m-eclair-delta.yaml
+++ b/tf-m-eclair-delta.yaml
@@ -110,6 +110,17 @@
           name: 'TFM_TESTS_REFSPEC'
           default: ''
       - string:
+          name: 'TFM_EXTRAS_URL'
+          default: 'https://git.trustedfirmware.org/TF-M/tf-m-extras.git'
+      - string:
+          name: 'TFM_EXTRAS_REFSPEC'
+          default: ''
+          description: |
+            Specify which tf-m-extras version to use
+            refs/heads/<branch_name> : Pick up latest HEAD on branch
+            TAG_NAME                 : Pick up a tagged version
+            full commit hash         : Pick up a specific commit
+      - string:
           name: 'PSA_ARCH_TESTS_URL'
           default: 'https://git.trustedfirmware.org/mirror/psa-arch-tests.git'
       - string:
diff --git a/tf-m-nightly-performance.yaml b/tf-m-nightly-performance.yaml
index 9cd8263..2e9087a 100644
--- a/tf-m-nightly-performance.yaml
+++ b/tf-m-nightly-performance.yaml
@@ -104,6 +104,17 @@
             TAG_NAME                 : Pick up a tagged version
             full commit hash         : Pick up a specific commit
       - string:
+          name: 'TFM_EXTRAS_URL'
+          default: 'https://git.trustedfirmware.org/TF-M/tf-m-extras.git'
+      - string:
+          name: 'TFM_EXTRAS_REFSPEC'
+          default: ''
+          description: |
+            Specify which tf-m-extras version to use
+            refs/heads/<branch_name> : Pick up latest HEAD on branch
+            TAG_NAME                 : Pick up a tagged version
+            full commit hash         : Pick up a specific commit
+      - string:
           name: 'TFM_TOOLS_URL'
           default: 'https://git.trustedfirmware.org/TF-M/tf-m-tools.git'
       - string: