diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 766e12cb..1111ccc4 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -27,10 +27,11 @@ jobs:
 
   build:
     name: Build it
-    uses: codehaus-plexus/.github/.github/workflows/maven.yml@v0.0.1
+    uses: codehaus-plexus/.github/.github/workflows/maven.yml@master
     with:
-      jdk-matrix: '["8", "11", "17"]'
-      jdk-distribution-matrix: '["zulu", "temurin"]'
+      jdk-fast-fail-build: '11'
+      jdk-matrix: '["11", "17"]'
+      jdk-distribution-matrix: '["zulu", "temurin", "microsoft", "liberica"]'
       os-matrix: '["ubuntu-latest","windows-latest", "macOS-latest"]'
       maven_args: 'verify javadoc:javadoc -e -B -V -fae -Pno-tests-if-not-on-osx'
 
diff --git a/pom.xml b/pom.xml
index 0ef6d1e1..9cc2aa04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,6 @@
     <connection>${scm.url}</connection>
     <developerConnection>${scm.url}</developerConnection>
     <url>http://github.com/codehaus-plexus/plexus-compiler/tree/${project.scm.tag}/</url>
-    <tag>master</tag>
   </scm>
   <issueManagement>
     <system>github</system>
@@ -43,7 +42,7 @@
 
   <properties>
     <scm.url>scm:git:git@github.com:codehaus-plexus/plexus-compiler.git</scm.url>
-    <javaVersion>8</javaVersion>
+    <javaVersion>11</javaVersion>
     <redirectTestOutputToFile>true</redirectTestOutputToFile>
     <project.build.outputTimestamp>2021-10-18T08:22:06Z</project.build.outputTimestamp>
     <jupiter.version>5.8.2</jupiter.version>
@@ -121,6 +120,13 @@
             <redirectTestOutputToFile>${redirectTestOutputToFile}</redirectTestOutputToFile>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <configuration>
+            <release>8</release>
+          </configuration>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
@@ -192,8 +198,8 @@
             <configuration>
               <rules>
                 <requireJavaVersion>
-                  <version>[1.8,)</version>
-                  <message>[ERROR] OLD JDK [${java.version}] in use. This projects requires JDK 8 or newer</message>
+                  <version>[11,)</version>
+                  <message>[ERROR] OLD JDK [${java.version}] in use. This projects requires JDK 11 or newer</message>
                 </requireJavaVersion>
               </rules>
             </configuration>