diff --git a/jenkins/build-docs.jpl b/jenkins/build-docs.jpl
index a2a0208..7a2a969 100644
--- a/jenkins/build-docs.jpl
+++ b/jenkins/build-docs.jpl
@@ -1,6 +1,6 @@
 #!/usr/bin/env groovy
 //-------------------------------------------------------------------------------
-// Copyright (c) 2020, Arm Limited and Contributors. All rights reserved.
+// Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
 //
 // SPDX-License-Identifier: BSD-3-Clause
 //
@@ -10,7 +10,7 @@
 import org.trustedfirmware.Gerrit
 
 timestamps {
-  node("docker-amd64-tf-m-bionic") {
+  node("docker-amd64-tf-m-jammy") {
     stage("Init") {
       cleanWs()
       dir("tf-m-ci-scripts") {
diff --git a/jenkins/checkpatch.jpl b/jenkins/checkpatch.jpl
index 2f87a98..ecc3507 100644
--- a/jenkins/checkpatch.jpl
+++ b/jenkins/checkpatch.jpl
@@ -1,6 +1,6 @@
 #!/usr/bin/env groovy
 //-------------------------------------------------------------------------------
-// Copyright (c) 2020, Arm Limited and Contributors. All rights reserved.
+// Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
 //
 // SPDX-License-Identifier: BSD-3-Clause
 //
@@ -10,7 +10,7 @@
 import org.trustedfirmware.Gerrit
 
 timestamps {
-  node("docker-amd64-tf-m-bionic") {
+  node("docker-amd64-tf-m-jammy") {
     // Clone TF-M repositories so share folder can be reused by downstream jobs
     stage("Init") {
       cleanWs()
diff --git a/jenkins/ci.jpl b/jenkins/ci.jpl
index 7462632..c614444 100644
--- a/jenkins/ci.jpl
+++ b/jenkins/ci.jpl
@@ -1,6 +1,6 @@
 #!/usr/bin/env groovy
 //-------------------------------------------------------------------------------
-// Copyright (c) 2020-2023, Arm Limited and Contributors. All rights reserved.
+// Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
 //
 // SPDX-License-Identifier: BSD-3-Clause
 //
@@ -322,7 +322,7 @@
 def results = [:]
 
 timestamps {
-  node("docker-amd64-tf-m-bionic") {
+  node("docker-amd64-tf-m-jammy") {
     stage("Init") {
       cleanWs()
       dir("tf-m-ci-scripts") {
diff --git a/jenkins/cppcheck.jpl b/jenkins/cppcheck.jpl
index 69cc9b0..46e6956 100644
--- a/jenkins/cppcheck.jpl
+++ b/jenkins/cppcheck.jpl
@@ -1,6 +1,6 @@
 #!/usr/bin/env groovy
 //-------------------------------------------------------------------------------
-// Copyright (c) 2020, Arm Limited and Contributors. All rights reserved.
+// Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
 //
 // SPDX-License-Identifier: BSD-3-Clause
 //
@@ -10,7 +10,7 @@
 import org.trustedfirmware.Gerrit
 
 timestamps {
-  node("docker-amd64-tf-m-bionic") {
+  node("docker-amd64-tf-m-jammy") {
     // Clone TF-M repositories so share folder can be reused by downstream jobs
     stage("Init") {
       cleanWs()
diff --git a/jenkins/lava-submit.jpl b/jenkins/lava-submit.jpl
index 6517bda..a541fa0 100644
--- a/jenkins/lava-submit.jpl
+++ b/jenkins/lava-submit.jpl
@@ -1,6 +1,6 @@
 #!/usr/bin/env groovy
 //-------------------------------------------------------------------------------
-// Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.
+// Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
 //
 // SPDX-License-Identifier: BSD-3-Clause
 //
@@ -60,7 +60,7 @@
 }
 
 timestamps {
-  node("docker-amd64-tf-m-bionic") {
+  node("docker-amd64-tf-m-jammy") {
     stage("Init") {
       cleanWs()
       dir("tf-m-ci-scripts") {
diff --git a/jenkins/static-checks.jpl b/jenkins/static-checks.jpl
index 66faecc..0e32c5c 100644
--- a/jenkins/static-checks.jpl
+++ b/jenkins/static-checks.jpl
@@ -1,6 +1,6 @@
 #!/usr/bin/env groovy
 //-------------------------------------------------------------------------------
-// Copyright (c) 2020, Arm Limited and Contributors. All rights reserved.
+// Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
 //
 // SPDX-License-Identifier: BSD-3-Clause
 //
@@ -10,7 +10,7 @@
 import org.trustedfirmware.Gerrit
 
 timestamps {
-  node("docker-amd64-tf-m-bionic") {
+  node("docker-amd64-tf-m-jammy") {
     stage("Init") {
       cleanWs()
       dir("tf-m-ci-scripts") {
diff --git a/jenkins/static.jpl b/jenkins/static.jpl
index dc8477e..804dd91 100644
--- a/jenkins/static.jpl
+++ b/jenkins/static.jpl
@@ -1,6 +1,6 @@
 #!/usr/bin/env groovy
 //-------------------------------------------------------------------------------
-// Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
+// Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
 //
 // SPDX-License-Identifier: BSD-3-Clause
 //
@@ -34,7 +34,7 @@
 def status = 1
 
 timestamps {
-  node("docker-amd64-tf-m-bionic") {
+  node("docker-amd64-tf-m-jammy") {
     stage("Init") {
       cleanWs()
       dir("tf-m-ci-scripts") {
diff --git a/src/org/trustedfirmware/Gerrit.groovy b/src/org/trustedfirmware/Gerrit.groovy
index 3c2f41d..e58574a 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-tf-m-bionic") {
+  node("docker-amd64-tf-m-jammy") {
     cleanWs()
     dir("tf-m-ci-scripts") {
       checkout([$class: 'GitSCM', branches: [[name: '$CI_SCRIPTS_BRANCH']], userRemoteConfigs: [[credentialsId: 'GIT_SSH_KEY', url: '$CI_SCRIPTS_REPO']]])
@@ -36,7 +36,7 @@
 }
 
 def comment(comment) {
-  node("docker-amd64-tf-m-bionic") {
+  node("docker-amd64-tf-m-jammy") {
     cleanWs()
     dir("tf-m-ci-scripts") {
       checkout([$class: 'GitSCM', branches: [[name: '$CI_SCRIPTS_BRANCH']], userRemoteConfigs: [[credentialsId: 'GIT_SSH_KEY', url: '$CI_SCRIPTS_REPO']]])