diff --git a/tools/code-tools/Jenkinsfile b/tools/code-tools/Jenkinsfile
index 2b111773a..da1bb301a 100644
--- a/tools/code-tools/Jenkinsfile
+++ b/tools/code-tools/Jenkinsfile
@@ -26,7 +26,7 @@ pipeline {
                         build('jtreg')
                     }
                 }
-                stage('sbom') {
+                stage('temurin-sbom') {
                     agent {
                         label NODE_LABEL
                     }
@@ -45,16 +45,16 @@ def build(stageName) {
         try {
             checkout scm
             script {
-                if ( stageName != 'sbom' ) {
-                    checkout([$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: "${stageName}"]], submoduleCfg: [], userRemoteConfigs: [[url: "https://github.com/openjdk/${stageName}"]]])
-                } else {
-                    checkout([$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: "${stageName}"]], submoduleCfg: [], userRemoteConfigs: [[url: "https://github.com/adoptium/temurin-build.git"]]])
+                def toolsUrl = "https://github.com/openjdk/${stageName}"
+                if ( stageName == 'temurin-sbom' ) {
+                    toolsUrl = "https://github.com/adoptium/temurin-build.git"
                 }
+                checkout([$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: "${stageName}"]], submoduleCfg: [], userRemoteConfigs: [[url: toolsUrl]]])
             }
             sh label: "${stageName}", script: "./tools/code-tools/${stageName}.sh"
-            archiveArtifacts artifacts: "${stageName}/*.tar.gz, ${stageName}/${stageName}*.jar, ${stageName}/${stageName}*.jar.*.txt, ${stageName}/*.tar.gz.*sum*.txt, ${stageName}/${stageName}*.jar.html, ${stageName}/${stageName}*.jar.md", followSymlinks: false
+            archiveArtifacts artifacts: "**/temurin-*-sbom.jar, ${stageName}/*.tar.gz, ${stageName}/${stageName}*.jar, ${stageName}/${stageName}*.jar.*.txt, ${stageName}/*.tar.gz.*sum*.txt, ${stageName}/${stageName}*.jar.html, ${stageName}/${stageName}*.jar.md", followSymlinks: false
         } catch (Exception e) {
-            slackSend channel: 'jenkins', color: 'danger', message: "${env.JOB_NAME} : #${env.BUILD_NUMBER} : ${stageName}() FAILED with following error message:\n${e}", teamDomain: 'adoptium'
+            //slackSend channel: 'jenkins', color: 'danger', message: "${env.JOB_NAME} : #${env.BUILD_NUMBER} : ${stageName}() FAILED with following error message:\n${e}", teamDomain: 'adoptium'
             throw new Exception("[ERROR] ${stageName} FAILED\n${e}")
         }
     }
diff --git a/tools/code-tools/temurin-sbom.sh b/tools/code-tools/temurin-sbom.sh
index 45cbdcc71..94ef0c9ce 100755
--- a/tools/code-tools/temurin-sbom.sh
+++ b/tools/code-tools/temurin-sbom.sh
@@ -1,138 +1,10 @@
 #!/bin/bash
-# shellcheck disable=SC2035,SC2116
-
 set -eu
 
-readonly JTREG_5='jtreg5.1-b01'
-readonly JTREG_6='jtreg-6+1'
-readonly JTREG_6_1='jtreg-6.1+1'
-readonly JTREG_7='jtreg-7+1'
-readonly JTREG_7_1='jtreg-7.1.1+1'
-readonly JTREG_7_2='jtreg-7.2+1'
-
-function checkWorkspaceVar()
-{
-  echo 'Checking WORKSPACE variable...'
-
-  if [ -z "$WORKSPACE" ] ; then
-    echo -n 'WORKSPACE variable is empty, setting to current dir: '
-    WORKSPACE="$( pwd )"
-    echo "$WORKSPACE"
-  else
-    echo "WORKSPACE variable is already set to '$WORKSPACE'"
-  fi
-}
-
-function clearWorkspace()
-{
-  echo 'Cleaning workspace before the build...'
-  rm -rf *.zip *.tar.gz
-
-  unset JAVATEST_HOME
-
-  echo 'Deletion previous build dist...'
-  rm -rf build dist
-}
-
-buildJTReg()
-{ 
-  version="jtregtip"
-  if [ "$#" -eq 1 ]; then
-    version=$1
-    if [ "$1" == "$JTREG_5" ]; then
-      export BUILD_NUMBER="b01"
-      export BUILD_VERSION="5.1"
-    elif [ "$1" == "$JTREG_6" ]; then
-      export JTREG_BUILD_NUMBER="1"
-      export BUILD_VERSION="6"
-    elif [ "$1" == "$JTREG_6_1" ]; then
-      export JTREG_BUILD_NUMBER="1"
-      export BUILD_VERSION="6.1"
-    elif [ "$1" == "$JTREG_7" ]; then
-      export JTREG_BUILD_NUMBER="1"
-      export BUILD_VERSION="7"
-      export JAVA_HOME=/usr/lib/jvm/jdk-11
-      export PATH=$PATH:$JAVA_HOME/bin
-    elif [ "$1" == "$JTREG_7_1" ]; then
-      export JTREG_BUILD_NUMBER="1"
-      export BUILD_VERSION="7.1.1"
-      export JAVA_HOME=/usr/lib/jvm/jdk-11
-      export PATH=$PATH:$JAVA_HOME/bin
-    elif [ "$1" == "$JTREG_7_2" ]; then
-      export JTREG_BUILD_NUMBER="1"
-      export BUILD_VERSION="7.2"
-      export JAVA_HOME=/usr/lib/jvm/jdk-11
-      export PATH=$PATH:$JAVA_HOME/bin
-    fi
-    git checkout $version
-  else
-    unset BUILD_NUMBER
-    unset BUILD_VERSION
-    unset JTREG_BUILD_NUMBER
-    export JAVA_HOME=/usr/lib/jvm/jdk-11
-    export PATH=$PATH:$JAVA_HOME/bin
-    git checkout master
-  fi
-
-  echo ""
-  echo "***********************************************"
-  echo "Building JTREG $version..."
-  echo "***********************************************"
-  (
-    echo "JAVA_HOME: $JAVA_HOME"
-    echo "Changing into $WORKSPACE"
-    cd "$WORKSPACE"
-    echo "Currently in $PWD"
-
-    echo "Removing contents of build folder"
-    rm -fr build || true
-    if [ "$version" == "$JTREG_5" ]; then
-      chmod +x make/build-all.sh
-      make/build-all.sh "$JAVA_HOME"
-    else
-      chmod +x make/build.sh
-      make/build.sh --jdk "$JAVA_HOME"
-    fi
-   
-    cd build/images
-
-    createWin32FolderWithJTRegBinaries
-
-    tar -cvf jtreg.tar jtreg
-    gzip -9 jtreg.tar
-    mv jtreg.tar.gz "$WORKSPACE/$version.tar.gz"
-    createChecksum "$WORKSPACE/$version.tar.gz" "$WORKSPACE"
-    git reset --hard HEAD
-  )
-}
-
-createWin32FolderWithJTRegBinaries()
-{
-   mkdir -p jtreg/win32
-   cp -fr jtreg/bin jtreg/win32/
-}
-
-createChecksum() {
-    ARCHIVE_FULL_PATH=$1
-    ARCHIVE_NAME=$(basename "${ARCHIVE_FULL_PATH}")
-    DESTINATION=$2
-
-    echo "Creating checksum for ${ARCHIVE_FULL_PATH} at ${DESTINATION}/${ARCHIVE_NAME}.sha256sum.txt"
-
-    sha256sum "${ARCHIVE_FULL_PATH}" > "${DESTINATION}/${ARCHIVE_NAME}.sha256sum.txt"
-}
-
-checkWorkspaceVar
-clearWorkspace
 echo 'Starting build process...'
-export WORKSPACE="$WORKSPACE/jtreg"
+export WORKSPACE="$WORKSPACE/temurin-sbom/cyclonedx-lib"
 cd "$WORKSPACE"
-buildJTReg "$JTREG_5"
-buildJTReg "$JTREG_6"
-buildJTReg "$JTREG_6_1"
-buildJTReg "$JTREG_6_1"
-buildJTReg "$JTREG_7"
-buildJTReg "$JTREG_7_1"
-buildJTReg "$JTREG_7_2"
-buildJTReg
-echo '...finished with build process.'
+export JAVA_HOME=/usr/lib/jvm/jdk-17
+ant -f build.xml clean
+ant -f build.xml build-sign-sbom
+ant -f build.xml build