diff --git a/pom.xml b/pom.xml
index 6d157d0..b2b9ccd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -347,17 +347,13 @@
         <executions>
           <execution>
             <goals>
-              <goal>toolchain</goal>
+              <goal>select-jdk-toolchain</goal>
             </goals>
+            <configuration>
+              <version>[17,18)</version>
+            </configuration>
           </execution>
         </executions>
-        <configuration>
-          <toolchains>
-            <jdk>
-              <version>17</version>
-            </jdk>
-          </toolchains>
-        </configuration>
       </plugin>
 
       <plugin>
diff --git a/src/it/projects/bare-config/pom.xml b/src/it/projects/bare-config/pom.xml
index a9b16c1..d666534 100644
--- a/src/it/projects/bare-config/pom.xml
+++ b/src/it/projects/bare-config/pom.xml
@@ -40,17 +40,13 @@
         <executions>
           <execution>
             <goals>
-              <goal>toolchain</goal>
+              <goal>select-jdk-toolchain</goal>
             </goals>
+            <configuration>
+              <version>[1.8,1.9)</version>
+            </configuration>
           </execution>
         </executions>
-        <configuration>
-          <toolchains>
-            <jdk>
-              <version>8</version>
-            </jdk>
-          </toolchains>
-        </configuration>
       </plugin>
 
       <plugin>
diff --git a/src/it/projects/default-config/pom.xml b/src/it/projects/default-config/pom.xml
index 3a84168..e5340b6 100644
--- a/src/it/projects/default-config/pom.xml
+++ b/src/it/projects/default-config/pom.xml
@@ -40,17 +40,13 @@
         <executions>
           <execution>
             <goals>
-              <goal>toolchain</goal>
+              <goal>select-jdk-toolchain</goal>
             </goals>
+            <configuration>
+              <version>[1.8,1.9)</version>
+            </configuration>
           </execution>
         </executions>
-        <configuration>
-          <toolchains>
-            <jdk>
-              <version>8</version>
-            </jdk>
-          </toolchains>
-        </configuration>
       </plugin>
 
       <plugin>
diff --git a/src/it/projects/empty-config/pom.xml b/src/it/projects/empty-config/pom.xml
index 3024f67..79e3efa 100644
--- a/src/it/projects/empty-config/pom.xml
+++ b/src/it/projects/empty-config/pom.xml
@@ -40,17 +40,13 @@
         <executions>
           <execution>
             <goals>
-              <goal>toolchain</goal>
+              <goal>select-jdk-toolchain</goal>
             </goals>
+            <configuration>
+              <version>[1.8,1.9)</version>
+            </configuration>
           </execution>
         </executions>
-        <configuration>
-          <toolchains>
-            <jdk>
-              <version>8</version>
-            </jdk>
-          </toolchains>
-        </configuration>
       </plugin>
 
       <plugin>
diff --git a/src/it/projects/full-config/pom.xml b/src/it/projects/full-config/pom.xml
index 1914626..e27b457 100644
--- a/src/it/projects/full-config/pom.xml
+++ b/src/it/projects/full-config/pom.xml
@@ -40,17 +40,13 @@
         <executions>
           <execution>
             <goals>
-              <goal>toolchain</goal>
+              <goal>select-jdk-toolchain</goal>
             </goals>
+            <configuration>
+              <version>[1.8,1.9)</version>
+            </configuration>
           </execution>
         </executions>
-        <configuration>
-          <toolchains>
-            <jdk>
-              <version>8</version>
-            </jdk>
-          </toolchains>
-        </configuration>
       </plugin>
 
       <plugin>
diff --git a/src/it/projects/tagonly-config/pom.xml b/src/it/projects/tagonly-config/pom.xml
index 705bf14..d785fc1 100644
--- a/src/it/projects/tagonly-config/pom.xml
+++ b/src/it/projects/tagonly-config/pom.xml
@@ -40,17 +40,13 @@
         <executions>
           <execution>
             <goals>
-              <goal>toolchain</goal>
+              <goal>select-jdk-toolchain</goal>
             </goals>
+            <configuration>
+              <version>[1.8,1.9)</version>
+            </configuration>
           </execution>
         </executions>
-        <configuration>
-          <toolchains>
-            <jdk>
-              <version>8</version>
-            </jdk>
-          </toolchains>
-        </configuration>
       </plugin>
 
       <plugin>