diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 179d814..3d4994d 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024 Contributors to the Eclipse Foundation
+# Copyright (c) 2024, 2025 Contributors to the Eclipse Foundation
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0 which is available at
@@ -15,7 +15,7 @@
 on: [pull_request, push]
 
 env:
-  JAVA_VERSION: '21'
+  JAVA_VERSION: '17'
   JAVA_DISTRO: 'temurin'
 
 concurrency:
diff --git a/connectors/helidon-connector/pom.xml b/connectors/helidon-connector/pom.xml
index 8c3c71c..9f53f9d 100644
--- a/connectors/helidon-connector/pom.xml
+++ b/connectors/helidon-connector/pom.xml
@@ -82,6 +82,7 @@
                <artifactId>maven-javadoc-plugin</artifactId>
                <configuration>
                     <skip>${javadoc.skip}</skip>
+                   <legacyMode>true</legacyMode>
                </configuration>
             </plugin>
         </plugins>
diff --git a/core-common/src/main/java/module-info.java b/core-common/src/main/java/module-info.java
index 0ed83e4..5caf76f 100644
--- a/core-common/src/main/java/module-info.java
+++ b/core-common/src/main/java/module-info.java
@@ -73,6 +73,7 @@
             org.glassfish.jersey.container.grizzly2.http,
             org.glassfish.jersey.container.servlet,
             org.glassfish.jersey.container.jetty.http,
+            org.glassfish.jersey.container.helidon,
             org.glassfish.jersey.media.sse,
             org.glassfish.jersey.media.jaxb,
             org.glassfish.jersey.media.json.jackson,
diff --git a/etc/scripts/apidocs.sh b/etc/scripts/apidocs.sh
index 097dfc6..6ca889f 100755
--- a/etc/scripts/apidocs.sh
+++ b/etc/scripts/apidocs.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-mvn -U -V -B clean install -Ppre-release -Pstaging -pl :apidocs -am -DskipTests
\ No newline at end of file
+mvn -U -V -B clean install javadoc:jar -Ppre-release -Pstaging -pl :apidocs -am -DskipTests
\ No newline at end of file
diff --git a/incubator/gae-integration/pom.xml b/incubator/gae-integration/pom.xml
index abd7f9c..52bbe39 100644
--- a/incubator/gae-integration/pom.xml
+++ b/incubator/gae-integration/pom.xml
@@ -84,6 +84,13 @@
                     </instructions>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <legacyMode>true</legacyMode>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>