diff --git a/rf-a-main.yaml b/rf-a-main.yaml
index ef06ded..c777c35 100644
--- a/rf-a-main.yaml
+++ b/rf-a-main.yaml
@@ -76,6 +76,9 @@
           description: |
             'Refs to fetch for the tf-a-ci-scripts repo e.g. refs/changes/13/31138/1'
       - string:
+          name: JOBS_PROJECT
+          default: ci/tf-a-job-configs.git
+      - string:
           name: JOBS_REFSPEC
           default: refs/heads/master
           description: |
@@ -86,7 +89,7 @@
           description: Folder containing shared repositories for downstream pipeline jobs
       - string:
           name: CLONE_REPOS
-          default: tf-a-ci-scripts,trusted-firmware-a,rusted-firmware-a
+          default: tf-a-job-configs,tf-a-ci-scripts,trusted-firmware-a,rusted-firmware-a
           description: |
             Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras)
       - string:
@@ -111,6 +114,7 @@
           cat << EOF > tf-a-env.param
           RF_GERRIT_PROJECT=${GERRIT_PROJECT}
           RFA_REFSPEC=${RFA_REFSPEC}
+          GERRIT_REFSPEC=${GERRIT_REFSPEC}
           GERRIT_BRANCH=${GERRIT_BRANCH}
           TF_GERRIT_PROJECT=TF-A/trusted-firmware-a
           TF_GERRIT_REFSPEC=${TF_GERRIT_REFSPEC}
@@ -133,6 +137,10 @@
             - name: rf-a-static
               current-parameters: true
               kill-phase-on: NEVER
+              predefined-parameters: |
+                GERRIT_BRANCH=${GERRIT_BRANCH}
+                RFA_REFSPEC=${RFA_REFSPEC}
+                GERRIT_REFSPEC=${GERRIT_REFSPEC}
               property-file: tf-a-env.param
       - multijob:
           name: Platform independent tests
@@ -145,6 +153,7 @@
                 TEST_REPO_NAME=rusted-firmware-a
                 TEST_REPO_PROJECT=RF-A
                 RFA_REFSPEC=$RFA_REFSPEC
+                GERRIT_REFSPEC=${GERRIT_REFSPEC}
               property-file: tf-a-env.param
       - multijob:
           name: Build Rusted Firmware A
diff --git a/rf-a-static.yaml b/rf-a-static.yaml
index 0258562..f5870ac 100644
--- a/rf-a-static.yaml
+++ b/rf-a-static.yaml
@@ -42,12 +42,15 @@
           description: |
             tf-a-job-configs refspec to use. The master branch is used by default.
       - string:
+          name: JOBS_PROJECT
+          default: ci/tf-a-job-configs.git
+      - string:
           name: SHARE_FOLDER
           default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
           description: Folder containing shared repositories for downstream pipeline jobs
       - string:
           name: CLONE_REPOS
-          default: tf-a-ci-scripts,trusted-firmware-a,rusted-firmware-a
+          default: tf-a-job-configs,tf-a-ci-scripts,rusted-firmware-a
           description: |
             Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras)
       - string:
@@ -73,6 +76,7 @@
           set -e
           cat << EOF > env.param
           RFA_REFSPEC=${RFA_REFSPEC}
+          GERRIT_REFSPEC=${GERRIT_REFSPEC}
           GERRIT_BRANCH=${GERRIT_BRANCH}
           EOF
           cd ${WORKSPACE}/rusted-firmware-a