diff --git a/jenkins/build-config.jpl b/jenkins/build-config.jpl
index c62fbc9..60e04d7 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-xenial"
+def nodeLabel = "docker-amd64-bionic"
 if (env.COMPILER == "ARMCLANG") {
-  nodeLabel = "docker-amd64-xenial-armclang"
+  nodeLabel = "docker-amd64-bionic-armclang"
 }
 
 node(nodeLabel) {
diff --git a/jenkins/build-docs.jpl b/jenkins/build-docs.jpl
index e434090..c486f25 100644
--- a/jenkins/build-docs.jpl
+++ b/jenkins/build-docs.jpl
@@ -9,7 +9,7 @@
 @Library('trustedfirmware') _
 import org.trustedfirmware.Gerrit
 
-node("docker-amd64-xenial") {
+node("docker-amd64-bionic") {
   stage("Init") {
     cleanWs()
     dir("trusted-firmware-m") {
diff --git a/jenkins/checkpatch.jpl b/jenkins/checkpatch.jpl
index 1db0f03..899f69f 100644
--- a/jenkins/checkpatch.jpl
+++ b/jenkins/checkpatch.jpl
@@ -9,7 +9,7 @@
 @Library('trustedfirmware') _
 import org.trustedfirmware.Gerrit
 
-node("docker-amd64-xenial") {
+node("docker-amd64-bionic") {
   stage("Init") {
     cleanWs()
     dir("trusted-firmware-m") {
diff --git a/jenkins/ci.jpl b/jenkins/ci.jpl
index cb5f990..28671a1 100644
--- a/jenkins/ci.jpl
+++ b/jenkins/ci.jpl
@@ -146,7 +146,7 @@
 def builds = [:]
 def results = [:]
 
-node("docker-amd64-xenial") {
+node("docker-amd64-bionic") {
   stage("Init") {
     cleanWs()
     dir("tf-m-ci-scripts") {
@@ -164,6 +164,7 @@
     builds["docs"] = buildDocs(results)
   }
 }
+
 stage("Builds") {
   def verify = 1
   try {
@@ -182,7 +183,7 @@
   }
 }
 
-node("docker-amd64-xenial") {
+node("docker-amd64-bionic") {
   stage("Copy Docs") {
     step([$class: 'CopyArtifact', projectName: 'tf-m-build-docs',
     selector: specific("${results['docs'][0]}"), target: './docs/',
diff --git a/jenkins/cppcheck.jpl b/jenkins/cppcheck.jpl
index 34e23b1..1aad8bd 100644
--- a/jenkins/cppcheck.jpl
+++ b/jenkins/cppcheck.jpl
@@ -9,7 +9,7 @@
 @Library('trustedfirmware') _
 import org.trustedfirmware.Gerrit
 
-node("docker-amd64-xenial") {
+node("docker-amd64-bionic") {
   stage("Init") {
     cleanWs()
     dir("trusted-firmware-m") {
diff --git a/jenkins/lava-submit.jpl b/jenkins/lava-submit.jpl
index 4be24b5..f247953 100644
--- a/jenkins/lava-submit.jpl
+++ b/jenkins/lava-submit.jpl
@@ -6,7 +6,7 @@
 //
 //-------------------------------------------------------------------------------
 
-node("docker-amd64-xenial") {
+node("docker-amd64-bionic") {
   stage("Init") {
     cleanWs()
     dir("tf-m-ci-scripts") {
diff --git a/src/org/trustedfirmware/Gerrit.groovy b/src/org/trustedfirmware/Gerrit.groovy
index 05d8398..effd3ba 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-xenial") {
+  node("docker-amd64-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-xenial") {
+  node("docker-amd64-bionic") {
     cleanWs()
     dir("tf-m-ci-scripts") {
       git url: '$CI_SCRIPTS_REPO', branch: '$CI_SCRIPTS_BRANCH', credentialsId: 'GIT_SSH_KEY'