diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 710fd90507d..53fc76d884b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,7 +25,14 @@ jobs:
     - name: Set up JDK 17
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: |
+          8
+          11
+          17
+        mvn-toolchain-id: |
+          JavaSE-1.8
+          JavaSE-11
+          JavaSE-17
         distribution: 'temurin'
         cache: maven
     - name: Set up Maven
@@ -38,7 +45,6 @@ jobs:
        run: >- 
         mvn
         --batch-mode
-        --global-toolchains ${{ github.workspace }}/.github/workflows/toolchains.xml
         -Pbree-libs
         -Papi-check
         -Dcompare-version-with-baselines.skip=false
@@ -176,7 +182,14 @@ jobs:
     - name: Set up JDK 17
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: |
+          8
+          11
+          17
+        mvn-toolchain-id: |
+          JavaSE-1.8
+          JavaSE-11
+          JavaSE-17
         distribution: 'temurin'
         cache: maven
     - name: Set up Maven
@@ -188,7 +201,6 @@ jobs:
         mvn
         -U
         --batch-mode
-        --global-toolchains ${{ github.workspace }}/.github/workflows/toolchains.xml
         --threads 1C
         -Pbuild-individual-bundles
         -Pbree-libs
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index f4b4e791460..a9f8cf64f6c 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -47,7 +47,14 @@ jobs:
     - name: Set up JDK 17
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: |
+          8
+          11
+          17
+        mvn-toolchain-id: |
+          JavaSE-1.8
+          JavaSE-11
+          JavaSE-17
         distribution: 'temurin'
         cache: maven
     - name: Set up Maven
@@ -60,7 +67,6 @@ jobs:
        run: >- 
         mvn
         --batch-mode
-        --global-toolchains ${{ github.workspace }}/.github/workflows/toolchains.xml
         -Pbree-libs
         -Papi-check
         -Dcompare-version-with-baselines.skip=false
diff --git a/.github/workflows/toolchains.xml b/.github/workflows/toolchains.xml
deleted file mode 100644
index 0ab2b760660..00000000000
--- a/.github/workflows/toolchains.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF8"?>
-<toolchains xmlns="http://maven.apache.org/TOOLCHAINS/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/TOOLCHAINS/1.1.0 http://maven.apache.org/xsd/toolchains-1.1.0.xsd">
-	<toolchain>
-		<type>jdk</type>
-		<provides>
-			<id>JavaSE-17</id>
-			<version>17</version>
-		</provides>
-		<configuration>
-			<jdkHome>${env.JAVA_HOME_17_X64}</jdkHome>
-		</configuration>
-	</toolchain>
-	<toolchain>
-		<type>jdk</type>
-		<provides>
-			<id>JavaSE-11</id>
-			<version>11</version>
-		</provides>
-		<configuration>
-			<jdkHome>${env.JAVA_HOME_11_X64}</jdkHome>
-		</configuration>
-	</toolchain>
-	<toolchain>
-		<type>jdk</type>
-		<provides>
-			<id>JavaSE-1.8</id>
-			<version>1.8</version>
-		</provides>
-		<configuration>
-			<jdkHome>${env.JAVA_HOME_8_X64}</jdkHome>
-		</configuration>
-	</toolchain>
-</toolchains>