diff --git a/.github/workflows/samples-java-client-jdk11.yaml b/.github/workflows/samples-java-client-jdk11.yaml
index ba45ec60448..7907118eb48 100644
--- a/.github/workflows/samples-java-client-jdk11.yaml
+++ b/.github/workflows/samples-java-client-jdk11.yaml
@@ -3,10 +3,10 @@ name: Samples Java Client JDK11
 on:
   push:
     paths:
-      - 'samples/client/petstore/java/native**'
+      - 'samples/client/petstore/java*/**'
   pull_request:
     paths:
-      - 'samples/client/petstore/java/native**'
+      - 'samples/client/petstore/java*/**'
 jobs:
   build:
     name: Build Java Client JDK11
@@ -16,8 +16,27 @@ jobs:
       matrix:
         sample:
           # clients
+          - samples/client/petstore/jaxrs-cxf-client
           - samples/client/petstore/java/native
           - samples/client/petstore/java/native-async
+          - samples/client/petstore/java/retrofit2
+          - samples/client/petstore/java/retrofit2rx2
+          - samples/client/petstore/java/retrofit2rx3
+          - samples/client/petstore/java/retrofit2-play26
+          - samples/client/petstore/java/resttemplate
+          - samples/client/petstore/java/resttemplate-withXml
+          - samples/client/petstore/java/webclient
+          - samples/client/petstore/java/webclient-nulable-arrays
+          - samples/client/petstore/java/vertx
+          - samples/client/petstore/java/jersey2-java8-localdatetime
+          - samples/client/petstore/java/resteasy
+          - samples/client/petstore/java/google-api-client
+          - samples/client/petstore/java/rest-assured
+          - samples/client/petstore/java/rest-assured-jackson
+          - samples/client/petstore/java/microprofile-rest-client
+          - samples/client/petstore/java/apache-httpclient
+          - samples/client/petstore/java/feign
+          - samples/client/petstore/java/jersey1
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2
diff --git a/pom.xml b/pom.xml
index 4bedd2157d1..5bcea3d8808 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1255,29 +1255,10 @@
                 <module>samples/client/petstore/scala-sttp</module>
                 <module>samples/client/petstore/scala-httpclient</module>
                 <module>samples/client/petstore/clojure</module>
-                <module>samples/client/petstore/java/feign</module>
-                <module>samples/client/petstore/java/jersey1</module>
                 <module>samples/client/petstore/java/jersey2-java8</module>
                 <module>samples/openapi3/client/petstore/java/jersey2-java8</module>
                 <module>samples/client/others/java/okhttp-gson-streaming</module>
                 <module>samples/client/petstore/java/okhttp-gson</module>
-                <module>samples/client/petstore/java/retrofit2</module>
-                <module>samples/client/petstore/java/retrofit2rx2</module>
-                <module>samples/client/petstore/java/retrofit2rx3</module>
-                <module>samples/client/petstore/java/retrofit2-play26</module>
-                <module>samples/client/petstore/jaxrs-cxf-client</module>
-                <module>samples/client/petstore/java/resttemplate</module>
-                <module>samples/client/petstore/java/resttemplate-withXml</module>
-                <module>samples/client/petstore/java/webclient</module>
-                <module>samples/client/petstore/java/webclient-nulable-arrays</module>
-                <module>samples/client/petstore/java/vertx</module>
-                <module>samples/client/petstore/java/jersey2-java8-localdatetime</module>
-                <module>samples/client/petstore/java/resteasy</module>
-                <module>samples/client/petstore/java/google-api-client</module>
-                <module>samples/client/petstore/java/rest-assured</module>
-                <module>samples/client/petstore/java/rest-assured-jackson</module>
-                <module>samples/client/petstore/java/microprofile-rest-client</module>
-                <module>samples/client/petstore/java/apache-httpclient</module>
             </modules>
         </profile>
         <!-- test with JDK9 in Shippable CI -->