diff --git a/jenkins/build-config.jpl b/jenkins/build-config.jpl
index 60af3dd..9a8e143 100644
--- a/jenkins/build-config.jpl
+++ b/jenkins/build-config.jpl
@@ -9,9 +9,9 @@
 @Library('trustedfirmware') _
 import org.trustedfirmware.Gerrit
 
-def nodeLabel = "docker-amd64-bionic"
+def nodeLabel = "docker-amd64-tf-m-bionic"
 if (env.COMPILER == "ARMCLANG") {
-  nodeLabel = "docker-amd64-bionic"
+  nodeLabel = "docker-amd64-tf-m-bionic"
 }
 
 node(nodeLabel) {
diff --git a/jenkins/build-docs.jpl b/jenkins/build-docs.jpl
index a677c26..559f94d 100644
--- a/jenkins/build-docs.jpl
+++ b/jenkins/build-docs.jpl
@@ -9,7 +9,7 @@
 @Library('trustedfirmware') _
 import org.trustedfirmware.Gerrit
 
-node("docker-amd64-bionic") {
+node("docker-amd64-tf-m-bionic") {
   stage("Init") {
     cleanWs()
     dir("trusted-firmware-m") {
diff --git a/jenkins/checkpatch.jpl b/jenkins/checkpatch.jpl
index 9d04984..337b75b 100644
--- a/jenkins/checkpatch.jpl
+++ b/jenkins/checkpatch.jpl
@@ -9,7 +9,7 @@
 @Library('trustedfirmware') _
 import org.trustedfirmware.Gerrit
 
-node("docker-amd64-bionic") {
+node("docker-amd64-tf-m-bionic") {
   stage("Init") {
     cleanWs()
     dir("trusted-firmware-m") {
diff --git a/jenkins/ci.jpl b/jenkins/ci.jpl
index 4b49b72..a93edde 100644
--- a/jenkins/ci.jpl
+++ b/jenkins/ci.jpl
@@ -504,7 +504,7 @@
 def builds = [:]
 def results = [:]
 
-node("docker-amd64-bionic") {
+node("docker-amd64-tf-m-bionic") {
   stage("Init") {
     cleanWs()
     dir("tf-m-ci-scripts") {
@@ -544,7 +544,7 @@
   }
 }
 
-node("docker-amd64-bionic") {
+node("docker-amd64-tf-m-bionic") {
   stage("Copy Docs") {
     if (env.JOB_NAME.equals("tf-m-build-and-test")) {
       step([$class: 'CopyArtifact', projectName: 'tf-m-build-docs',
diff --git a/jenkins/cppcheck.jpl b/jenkins/cppcheck.jpl
index 3223ac9..57550b4 100644
--- a/jenkins/cppcheck.jpl
+++ b/jenkins/cppcheck.jpl
@@ -9,7 +9,7 @@
 @Library('trustedfirmware') _
 import org.trustedfirmware.Gerrit
 
-node("docker-amd64-bionic") {
+node("docker-amd64-tf-m-bionic") {
   stage("Init") {
     cleanWs()
     dir("trusted-firmware-m") {
diff --git a/jenkins/lava-submit.jpl b/jenkins/lava-submit.jpl
index bcb0612..74ff1db 100644
--- a/jenkins/lava-submit.jpl
+++ b/jenkins/lava-submit.jpl
@@ -6,7 +6,7 @@
 //
 //-------------------------------------------------------------------------------
 
-node("docker-amd64-bionic") {
+node("docker-amd64-tf-m-bionic") {
   stage("Init") {
     cleanWs()
     dir("tf-m-ci-scripts") {
diff --git a/jenkins/static-checks.jpl b/jenkins/static-checks.jpl
index c447e2d..7fd04cf 100644
--- a/jenkins/static-checks.jpl
+++ b/jenkins/static-checks.jpl
@@ -9,7 +9,7 @@
 @Library('trustedfirmware') _
 import org.trustedfirmware.Gerrit
 
-node("docker-amd64-bionic") {
+node("docker-amd64-tf-m-bionic") {
   stage("Init") {
     cleanWs()
     dir("trusted-firmware-m") {
diff --git a/src/org/trustedfirmware/Gerrit.groovy b/src/org/trustedfirmware/Gerrit.groovy
index effd3ba..fa8f2a7 100644
--- a/src/org/trustedfirmware/Gerrit.groovy
+++ b/src/org/trustedfirmware/Gerrit.groovy
@@ -8,7 +8,7 @@
 package org.trustedfirmware
 
 def verifyStatus(value, verify_name, category) {
-  node("docker-amd64-bionic") {
+  node("docker-amd64-tf-m-bionic") {
     cleanWs()
     dir("tf-m-ci-scripts") {
       git url: '$CI_SCRIPTS_REPO', branch: '$CI_SCRIPTS_BRANCH', credentialsId: 'GIT_SSH_KEY'
@@ -36,7 +36,7 @@
 }
 
 def comment(comment) {
-  node("docker-amd64-bionic") {
+  node("docker-amd64-tf-m-bionic") {
     cleanWs()
     dir("tf-m-ci-scripts") {
       git url: '$CI_SCRIPTS_REPO', branch: '$CI_SCRIPTS_BRANCH', credentialsId: 'GIT_SSH_KEY'