diff --git a/mbed-tls-nightly-tests.yaml b/mbed-tls-nightly-tests.yaml
index 2d44769..f8c2daa 100644
--- a/mbed-tls-nightly-tests.yaml
+++ b/mbed-tls-nightly-tests.yaml
@@ -14,6 +14,26 @@
         description: Branch or commit to test
         name: MBED_TLS_BRANCH
         trim: true
+    - string:
+          default: ssh://git@github.com/Mbed-TLS/mbedtls-framework.git
+          description: Framework repo/fork
+          name: FRAMEWORK_REPO
+          trim: true
+    - string:
+          default: ''
+          description: Enter Framework branch/sha to override the sha specified in the Mbed TLS branch
+          name: FRAMEWORK_BRANCH
+          trim: true
+    - string:
+          default: ssh://git@github.com/Mbed-TLS/TF-PSA-Crypto.git
+          description: TF PSA Crypto repo/fork
+          name: TF_PSA_CRYPTO_REPO
+          trim: true
+    - string:
+          default: ''
+          description: Enter TF PSA Crypto branch/sha to override the sha specified in the Mbed TLS branch.
+          name: TF_PSA_CRYPTO_BRANCH
+          trim: true
     - bool:
         default: true
         description: Run basic-build-test.sh (test coverage measurement)
diff --git a/mbed-tls-restricted-pr-test-parametrized.yaml b/mbed-tls-restricted-pr-test-parametrized.yaml
index 954377a..af89e15 100644
--- a/mbed-tls-restricted-pr-test-parametrized.yaml
+++ b/mbed-tls-restricted-pr-test-parametrized.yaml
@@ -27,22 +27,22 @@
         trim: true
     - string:
         default: ssh://git@github.com/Mbed-TLS/mbedtls-framework.git
-        description: Framework repo/fork to override the one specified in the Mbed TLS branch (only used if FRAMEWORK_BRANCH is also set)
+        description: Framework repo/fork
         name: FRAMEWORK_REPO
         trim: true
     - string:
         default: ''
-        description: Framework branch/sha to override the sha specified in the Mbed TLS branch
+        description: Enter Framework branch/sha to override the sha specified in the Mbed TLS branch
         name: FRAMEWORK_BRANCH
         trim: true
     - string:
         default: ssh://git@github.com/Mbed-TLS/TF-PSA-Crypto.git
-        description: Enter TF PSA Crypto repo/fork to override the one specififed in the Mbed TLS branch. (used if TF_PSA_CRYPTO_BRANCH is also set)
+        description: TF PSA Crypto repo/fork
         name: TF_PSA_CRYPTO_REPO
         trim: true
     - string:
         default: ''
-        description: Enter TF PSA Crypto branch to override the one specififed in the Mbed TLS branch.
+        description: Enter TF PSA Crypto branch/sha to override the sha specified in the Mbed TLS branch.
         name: TF_PSA_CRYPTO_BRANCH
         trim: true
     - bool:
diff --git a/mbedtls-release-ci-testing.yaml b/mbedtls-release-ci-testing.yaml
index e22cfd9..9a40c75 100644
--- a/mbedtls-release-ci-testing.yaml
+++ b/mbedtls-release-ci-testing.yaml
@@ -22,22 +22,22 @@
         trim: true
     - string:
         default: ssh://git@github.com/Mbed-TLS/mbedtls-framework.git
-        description: Framework repo/fork to override the one specified in the Mbed TLS branch (only used if FRAMEWORK_BRANCH is also set)
+        description: Framework repo/fork
         name: FRAMEWORK_REPO
         trim: true
     - string:
         default: ''
-        description: Framework branch/sha to override the sha specified in the Mbed TLS branch
+        description: Enter Framework branch/sha to override the sha specified in the Mbed TLS branch.
         name: FRAMEWORK_BRANCH
         trim: true
     - string:
         default: ssh://git@github.com/Mbed-TLS/TF-PSA-Crypto.git
-        description: Enter TF PSA Crypto repo/fork to override the one specififed in the Mbed TLS branch. (used if TF_PSA_CRYPTO_BRANCH is also set)
+        description: TF PSA Crypto repo/fork
         name: TF_PSA_CRYPTO_REPO
         trim: true
     - string:
         default: ''
-        description: Enter TF PSA Crypto branch to override the one specififed in the Mbed TLS branch.
+        description: Enter TF PSA Crypto branch/sha to override the sha specified in the Mbed TLS branch.
         name: TF_PSA_CRYPTO_BRANCH
         trim: true
     - bool:
diff --git a/mbedtls-restricted-release-new.yaml b/mbedtls-restricted-release-new.yaml
index 7d0d45a..a9f2e8f 100644
--- a/mbedtls-restricted-release-new.yaml
+++ b/mbedtls-restricted-release-new.yaml
@@ -14,6 +14,26 @@
         description: Branch or commit to test
         name: MBED_TLS_BRANCH
         trim: true
+    - string:
+          default: ssh://git@github.com/Mbed-TLS/mbedtls-framework.git
+          description: Framework repo/fork
+          name: FRAMEWORK_REPO
+          trim: true
+    - string:
+          default: ''
+          description: Enter Framework branch/sha to override the sha specified in the Mbed TLS branch.
+          name: FRAMEWORK_BRANCH
+          trim: true
+    - string:
+          default: ssh://git@github.com/Mbed-TLS/TF-PSA-Crypto.git
+          description: TF PSA Crypto repo/fork
+          name: TF_PSA_CRYPTO_REPO
+          trim: true
+    - string:
+          default: ''
+          description: Enter TF PSA Crypto branch/sha to override the sha specified in the Mbed TLS branch.
+          name: TF_PSA_CRYPTO_BRANCH
+          trim: true
     - bool:
         default: true
         description: Run basic-build-test.sh (test coverage measurement)