diff --git a/cjkay-tf-a-make/Jenkinsfile b/cjkay-tf-a-make/Jenkinsfile
index 575b23c..b57a84b 100644
--- a/cjkay-tf-a-make/Jenkinsfile
+++ b/cjkay-tf-a-make/Jenkinsfile
@@ -33,10 +33,10 @@
         choice(name: 'TF_A_TOOLCHAIN',
             description: 'Toolchain to build TF-A with.',
             choices: [
-                'arm-gnu-aarch64-12.3.rel1',
-                'arm-gnu-aarch64-13.2.rel1',
-                'arm-gnu-aarch64-13.3.rel1',
-                'arm-gnu-aarch64-14.2.rel1',
+                'arm-gnu:aarch64-none-elf:12.3.rel1',
+                'arm-gnu:aarch64-none-elf:13.2.rel1',
+                'arm-gnu:aarch64-none-elf:13.3.rel1',
+                'arm-gnu:aarch64-none-elf:14.2.rel1',
             ])
 
         choice(name: 'TF_A_SYSTEM',
@@ -79,20 +79,31 @@
             }
         }
 
-        stage('Prepare Toolchain') {
+        stage('Install Arm GNU Toolchain') {
             when {
                 expression {
-                    params.TF_A_TOOLCHAIN == 'arm-gnu-aarch64-14.2.rel1'
+                    params.TF_A_TOOLCHAIN.startsWith('arm-gnu:')
                 }
             }
 
             steps {
+                script {
+                    def (_, target, version) = params.TF_A_TOOLCHAIN.split(':')
+
+                    def path = "/opt/arm-gnu-${target}-${version}"
+                    def tarball = "arm-gnu-toolchain-${version}-x86_64-${target}.tar.xz"
+                    def url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/${tarball}"
+
+                    env.TF_A_TOOLCHAIN_PATH = "${path}/bin"
+                }
+
                 sh """
                     set -eux
 
-                    mkdir -p "/opt/${params.TF_A_TOOLCHAIN}"
-                    curl -fsSL  https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-elf.tar.xz |
-                        tar -xJf - -C "/opt/${params.TF_A_TOOLCHAIN}" --strip-components=1
+                    mkdir -p '${path}'
+
+                    curl -fsSL '${url}' |
+                        tar -xJf - -C '${path}' --strip-components=1
                 """
             }
         }
@@ -117,12 +128,12 @@
 
         stage('Build') {
             environment {
-                PATH = "/opt/${params.TF_A_TOOLCHAIN}/bin:${env.PATH}"
+                PATH = "${env.TF_A_TOOLCHAIN_PATH}:${env.PATH}"
                 TF_A_FLAGS = "${params.TF_A_FLAGS}"
             }
 
             steps {
-                sh 'make ${TF_A_FLAGS} | tee build.log'
+                sh 'make ${TF_A_FLAGS} 2>&1 | tee build.log'
             }
         }
     }