diff --git a/Jenkinsfile b/Jenkinsfile
index a790af9cd9e..b84c480d8dd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -58,16 +58,22 @@ pipeline {
     stage('Maven/Tycho Build & Test') {
       environment {
         MAVEN_OPTS = "-Xmx1500m"
-        // set all Java versions needed by our toolchains.xml
-        JAVA_HOME_17_X64 = tool(type:'jdk', name:'temurin-jdk17-latest')
-        JAVA_HOME_21_X64 = tool(type:'jdk', name:'temurin-jdk21-latest')
+        // Set all Java version that can be discovered/selected by maven-toolchains-plugin
+        JAVA_17_HOME = tool(type:'jdk', name:'temurin-jdk17-latest')
+        JAVA_21_HOME = tool(type:'jdk', name:'temurin-jdk21-latest')
       }
       steps {
         xvnc(useXauthority: true) {
           sh """
+            jdkEnvVar='JAVA_${javaVersion()}_HOME'
+            if [ "${JAVA_HOME}" = "\${JAVA_${javaVersion()}_HOME}" ]; then
+              # Workaround for https://github.com/apache/maven-toolchains-plugin/pull/148
+              # clear the structured variable and require JAVA_HOME instead
+              export JAVA_${javaVersion()}_HOME=''
+              jdkEnvVar='JAVA_HOME'
+            fi
             ./full-build.sh --tp=${selectedTargetPlatform()} \
-              ${javaVersion() == 17 ? '--toolchains releng/toolchains.xml -Pstrict-jdk-17' : ''} \
-              ${javaVersion() == 21 ? '-Pstrict-jdk-21' : ''}
+              -Pstrict-jdk-${javaVersion()} -Dtoolchain.jdk.env=\${jdkEnvVar}
           """
         }
       }// END steps
diff --git a/pom.xml b/pom.xml
index 36ddfcec8ad..e03b9dbb51e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,9 +127,10 @@
 		<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
 		<tycho-version>4.0.13</tycho-version>
 
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
 		<maven.compiler.release>17</maven.compiler.release>
+		<maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
+		<maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
+
 		<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
 
 		<build-helper-maven-plugin-version>3.3.0</build-helper-maven-plugin-version>
@@ -694,35 +695,15 @@
 		</profile>
 		<profile>
 			<id>strict-jdk-17</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-toolchains-plugin</artifactId>
-						<executions>
-							<execution>
-								<goals>
-									<goal>toolchain</goal>
-								</goals>
-							</execution>
-						</executions>
-						<configuration>
-							<toolchains>
-								<jdk>
-									<!-- Toolchain selected by maven/tycho-compiler for compilation and maven/tycho-surefire as JRE of launched test-runtimes-->
-									<version>17</version>
-								</jdk>
-							</toolchains>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
+			<properties>
+				<maven.compiler.release>17</maven.compiler.release>
+				<!-- Toolchain selected by maven/tycho-compiler for compilation and maven/tycho-surefire as JRE of launched test-runtimes-->
+				<toolchain.jdk.version>[17,18)</toolchain.jdk.version>
+			</properties>
+
 		</profile>
 		<profile>
 			<id>strict-jdk-21</id>
-			<!--
-				Here we don't use the toolchain relying on the effective Java version used for the build
-			-->
 			<properties>
 				<!--
 					Since the Xtend compiler generates Java code using new API introduced in Java 21,
@@ -731,10 +712,7 @@
 					see https://github.com/eclipse-xtext/xtext/issues/2686#issuecomment-2038175179
 				-->
 				<maven.compiler.release>21</maven.compiler.release>
-				<!--
-					Force generatation of Java 21 bytecode
-				-->
-				<maven.compiler.target>21</maven.compiler.target>
+				<toolchain.jdk.version>[21,22)</toolchain.jdk.version>
 			</properties>
 		</profile>
 	</profiles>
@@ -766,7 +744,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-toolchains-plugin</artifactId>
-					<version>3.1.0</version>
+					<version>3.2.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -1005,6 +983,17 @@
 				<version>${tycho-version}</version>
 				<extensions>true</extensions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-toolchains-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>select-jdk-toolchain</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>
diff --git a/releng/toolchains.xml b/releng/toolchains.xml
deleted file mode 100644
index f23efad0afc..00000000000
--- a/releng/toolchains.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF8"?>
-<toolchains xmlns="https://maven.apache.org/TOOLCHAINS/1.1.0"
-	xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="https://maven.apache.org/TOOLCHAINS/1.1.0 https://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-21</id>
-			<version>21</version>
-		</provides>
-		<configuration>
-			<jdkHome>${env.JAVA_HOME_21_X64}</jdkHome>
-		</configuration>
-	</toolchain>
-</toolchains>