diff --git a/src/org/trustedfirmware/Gerrit.groovy b/src/org/trustedfirmware/Gerrit.groovy
index 7addf0d..732fe58 100644
--- a/src/org/trustedfirmware/Gerrit.groovy
+++ b/src/org/trustedfirmware/Gerrit.groovy
@@ -11,7 +11,7 @@
   node("docker-amd64-xenial") {
     cleanWs()
     dir("tf-m-ci-scripts") {
-      git url: '$CI_SCRIPTS_REPO', branch: 'master', credentialsId: 'GIT_SSH_KEY'
+      git url: '$CI_SCRIPTS_REPO', branch: '$CI_SCRIPTS_BRANCH', credentialsId: 'GIT_SSH_KEY'
     }
     verifyStatusInWorkspace(value, verify_name, category)
   }
@@ -38,7 +38,7 @@
   node("docker-amd64-xenial") {
     cleanWs()
     dir("tf-m-ci-scripts") {
-      git url: '$CI_SCRIPTS_REPO', branch: 'master', credentialsId: 'GIT_SSH_KEY'
+      git url: '$CI_SCRIPTS_REPO', branch: '$CI_SCRIPTS_BRANCH', credentialsId: 'GIT_SSH_KEY'
     }
     commentInWorkspace(comment)
   }
diff --git a/src/org/trustedfirmware/Summary.groovy b/src/org/trustedfirmware/Summary.groovy
index bb5b16d..ec46775 100644
--- a/src/org/trustedfirmware/Summary.groovy
+++ b/src/org/trustedfirmware/Summary.groovy
@@ -20,7 +20,12 @@
     } else {
       bl2_string = 'NOBL2'
     }
-    row_string = "${params['TARGET_PLATFORM']}_${params['COMPILER']}_${params['CMAKE_BUILD_TYPE']}_${bl2_string}"
+    if (params["PSA_API_SUITE"].isEmpty()) {
+      psa_string = ""
+    } else {
+      psa_string = "_${params['PSA_API_SUITE']}"
+    }
+    row_string = "${params['TARGET_PLATFORM']}_${params['COMPILER']}_${params['CMAKE_BUILD_TYPE']}_${bl2_string}${psa_string}"
     column_string = "${params['PROJ_CONFIG']}"
     row = table[row_string]
     if (row == null) {