diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 88d54afd..a5848b67 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -166,7 +166,8 @@ jobs:
         }
       - {
         name: Run tests and build with Maven 21,
-        run: mvn --batch-mode clean package -DtrimStackTrace=false -Djava.version=21
+        id: build-next-java,
+        run: mvn --batch-mode clean test -DtrimStackTrace=false -Djava.version=21
       }
   build:
     needs: [
diff --git a/.project-keeper.yml b/.project-keeper.yml
index 54b6c0f4..926a43e8 100644
--- a/.project-keeper.yml
+++ b/.project-keeper.yml
@@ -72,8 +72,6 @@ version:
 excludes:
   # PK can't use itself as a Maven plugin
   - regex: "W-PK-CORE-151: Pom file .* contains no reference to project-keeper-maven-plugin."
-  # Build with Java 21 fails due to missing JavaDoc comments, see https://github.com/exasol/project-keeper/issues/596
-  ###- "E-PK-CORE-17: Missing required file: '.github/workflows/ci-build-next-java.yml'"
   # No configuration necessary for aggregator POM
   - "E-PK-CORE-103: Missing parent declaration in 'pom.xml'"
   - "E-PK-CORE-17: Missing required file: 'pk_generated_parent.pom'"
@@ -135,6 +133,16 @@ build:
               ls -lh coverage-aggregator/target/metrics.json
               cat coverage-aggregator/target/metrics.json
 
+        # Build with Java 21 fails due to missing JavaDoc comments, see https://github.com/exasol/project-keeper/issues/596
+        - action: REPLACE
+          job: next-java-compatibility
+          stepId: build-next-java
+          content:
+            name: Run tests and build with Maven 21
+            id: build-next-java
+            # Only run tests as javadoc has warnings with Java 21
+            run: mvn --batch-mode clean test -DtrimStackTrace=false -Djava.version=21
+
     # [itest->dsn~customize-build-process.dependency-check~0]
     - name: "dependencies_check.yml"
       stepCustomizations:
diff --git a/project-keeper/src/main/resources/templates/.github/workflows/ci-build-db-version-matrix.yml b/project-keeper/src/main/resources/templates/.github/workflows/ci-build-db-version-matrix.yml
index 872a7e2b..4185c7f0 100644
--- a/project-keeper/src/main/resources/templates/.github/workflows/ci-build-db-version-matrix.yml
+++ b/project-keeper/src/main/resources/templates/.github/workflows/ci-build-db-version-matrix.yml
@@ -160,6 +160,7 @@ jobs:
           java-version: $nextJavaVersion
           cache: "maven"
       - name: Run tests and build with Maven $nextJavaVersion
+        id: build-next-java
         run: mvn --batch-mode clean package -DtrimStackTrace=false -Djava.version=$nextJavaVersion
 
   build:
diff --git a/project-keeper/src/main/resources/templates/.github/workflows/ci-build.yml b/project-keeper/src/main/resources/templates/.github/workflows/ci-build.yml
index c774b920..ac4aa44c 100644
--- a/project-keeper/src/main/resources/templates/.github/workflows/ci-build.yml
+++ b/project-keeper/src/main/resources/templates/.github/workflows/ci-build.yml
@@ -151,6 +151,7 @@ jobs:
           java-version: $nextJavaVersion
           cache: "maven"
       - name: Run tests and build with Maven $nextJavaVersion
+        id: build-next-java
         run: mvn --batch-mode clean package -DtrimStackTrace=false -Djava.version=$nextJavaVersion
 
   build: