diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index f4a6e96f..f8f3b6af 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -1,68 +1,30 @@
-name: Build Maven Projects
+name: Build Maven Projects (Java 8, 11, 17)
+
 on:
   push:
   schedule:
     - cron: '0 5 * * SUN'
+
 jobs:
-  build-java-8-and-17-projects:
+  build-java-8-11-17-projects:
     strategy:
       fail-fast: false
       matrix:
-        versions: [8, 17]
-    runs-on: ubuntu-20.04
+        versions: [8, 11, 17]
+    runs-on: ubuntu-latest
     name: Build Java ${{ matrix.versions }} projects
     steps:
       - name: VCS checkout
-        uses: actions/checkout@v1
-
-      - name: Set up cache
-        uses: actions/cache@v1
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-jdk${{ matrix.versions }}-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-jdk${{ matrix.versions }}-
+        uses: actions/checkout@v4
 
       - name: Set up JDK ${{ matrix.versions }}
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.versions }}
-          distribution: 'adopt'
-          java-package: 'jdk'
+          distribution: adopt
+          cache: maven
 
       - name: Build all projects with Maven
         run: |
           chmod +x ./buildJdk${{ matrix.versions }}Projects.sh
           ./buildJdk${{ matrix.versions }}Projects.sh
-
-  build-java-11-project-batches:
-    strategy:
-      fail-fast: false
-      matrix:
-        batch: [1, 2, 3]
-    runs-on: ubuntu-20.04
-    name: Build Java 11 Batch ${{ matrix.batch }} projects
-    steps:
-      - name: VCS checkout
-        uses: actions/checkout@v1
-
-      - name: Set up cache
-        uses: actions/cache@v1
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-jdk${{ matrix.batch }}-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-jdk${{ matrix.batch }}-
-
-      - name: Set up JDK $11
-        uses: actions/setup-java@v2
-        with:
-          java-version: 11
-          distribution: 'adopt'
-          java-package: 'jdk'
-
-      - name: Build all projects of batch with Maven
-        run: |
-          chmod +x ./buildJdk11Projects_0${{ matrix.batch }}.sh
-          ./buildJdk11Projects_0${{ matrix.batch }}.sh
-          
\ No newline at end of file
diff --git a/buildJdk11Projects_01.sh b/buildJdk11Projects.sh
similarity index 52%
rename from buildJdk11Projects_01.sh
rename to buildJdk11Projects.sh
index 022729b1..fcd2d39d 100755
--- a/buildJdk11Projects_01.sh
+++ b/buildJdk11Projects.sh
@@ -5,30 +5,31 @@ set -o pipefail
 
 mvn -B -f consumer-driven-contracts-with-spring-cloud-contract/book-store-server install
 
-declare -a arr=("whats-new-in-spring-boot-2.1"
+declare -a arr=(
  "charts-in-pdf-java-ee"
- "avoid-repeating-attributes-in-jpa-entities"
  "java-benchmarking-with-jmh"
- "lazy-loading-of-jpa-attributes-with-hibernate"
  "graalvm-intro"
- "send-emails-with-sendgrid-and-spring-boot"
  "bootstrap-jakarta-ee-8-application"
  "custom-maven-archetype"
- "demo-crud-application"
- "dynamic-sql-querying-with-pagination"
- "deploy-spring-boot-to-gke"
- "spring-boot-hibernate-flyway-best-practices"
  "guide-to-jakarta-ee-with-react-and-postgresql"
  "five-java-9-features"
  "consumer-driven-contracts-with-spring-cloud-contract/book-store-client"
  "java-ee-with-kotlin"
- "spring-boot-with-kotlin"
- "difference-between-mock-and-mockbean"
- "spring-boot-override-test-properties"
  "test-java-http-clients"
- "spring-boot-test-mail-sending"
- "spring-boot-shedlock"
- "spring-data-mongo-test-testcontainers"
+  "telegram-bot-notifications-with-java"
+  "websockets-with-jakarta-ee"
+  "open-liberty-maven-plugin-review"
+  "jakarta-ee-react-file-handling"
+  "review-microshed-testing"
+  "whats-new-in-microprofile-3.1"
+  "serverless-java-aws-examples/thumbnail-generator"
+  "serverless-java-aws-examples/spring-cloud-function-aws"
+  "serverless-java-aws-examples/spring-cloud-function-kotlin-aws"
+  "five-unknown-junit-5-features"
+  "mockito-tips-and-tricks"
+  "testing-libraries-overview"
+  "testing-java-applications-with-maven"
+  "open-rewrite-example"
  )
 
 for project in "${arr[@]}"
diff --git a/buildJdk11Projects_02.sh b/buildJdk11Projects_02.sh
deleted file mode 100755
index 69287bac..00000000
--- a/buildJdk11Projects_02.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-set -e
-set -o pipefail
-
-declare -a arr=(
- "spring-boot-integration-tests-testcontainers"
- "telegram-bot-notifications-with-java"
- "websockets-with-jakarta-ee"
- "open-liberty-maven-plugin-review"
- "jakarta-ee-react-file-handling"
- "remote-debugging-spring-boot-application"
- "review-microshed-testing"
- "maven-plugins-to-ensure-quality"
- "spring-web-client-demo"
- "spring-boot-uploading-and-downloading-files-with-react"
- "spring-web-client-oauth2-reactive-stack"
- "spring-web-client-oauth2-servlet-stack"
- "spring-web-test-client"
- "spring-web-client-customizing"
- "spring-web-client-testing-with-mockwebserver"
- "spring-web-client-exchange-retrieve"
- "whats-new-in-microprofile-3.1"
- "whats-new-in-spring-boot-2.1"
- "whats-new-in-spring-boot-2.2"
- "spring-web-test-client"
- "github-actions-java-maven"
-)
-
-for project in "${arr[@]}"
-do
-  mvn -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -f $project/pom.xml verify
-done
diff --git a/buildJdk11Projects_03.sh b/buildJdk11Projects_03.sh
deleted file mode 100755
index 242c1f68..00000000
--- a/buildJdk11Projects_03.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-set -e
-set -o pipefail
-
-declare -a arr=(
- "spring-web-client-expose-metrics"
- "spring-boot-selenium-integration-tests"
- "testing-json-serialization-spring"
- "spring-web-mvc-cheat-sheet"
- "spring-boot-aws-ssm-parameter-resolving"
- "expose-git-information-actuator"
- "serverless-java-aws-examples/thumbnail-generator"
- "serverless-java-aws-examples/spring-cloud-function-aws"
- "serverless-java-aws-examples/spring-cloud-function-kotlin-aws"
- "spring-security-aws-cognito-thymeleaf"
- "testcontainers-reuse-existing-containers"
- "five-unknown-junit-5-features"
- "spring-test-context-caching-introduction"
- "spring-boot-kotlin-testcontainers"
- "dependency-version-update-plugin"
- "testing-spring-boot-applications-with-mockmvc"
- "mockito-tips-and-tricks"
- "write-concise-web-tests-with-selenide"
- "testing-libraries-overview"
- "spring-boot-test-spring-events"
- "spring-boot-testing-tips-and-tricks"
- "testing-java-applications-with-maven"
- "open-rewrite-example"
-)
-
-for project in "${arr[@]}"
-do
-  mvn -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -f $project/pom.xml verify
-done
diff --git a/buildJdk17Projects.sh b/buildJdk17Projects.sh
index 09b81ae7..d15b0787 100644
--- a/buildJdk17Projects.sh
+++ b/buildJdk17Projects.sh
@@ -4,14 +4,9 @@ set -e
 set -o pipefail
 
 declare -a arr=(
- "testing-spring-rest-template"
-
  "serverless-java-aws-examples/java-aws-lambda-custom-image"
-
  "launchdarkly-java-development-testing-hints"
-
  "random-data-in-java-using-java-faker"
-
  "testcontainers-introduction"
  "maven-junit-paralellize-tests"
 )
diff --git a/buildJdk8Projects.sh b/buildJdk8Projects.sh
index b6db4dc9..374c2f66 100755
--- a/buildJdk8Projects.sh
+++ b/buildJdk8Projects.sh
@@ -3,7 +3,8 @@
 set -e
 set -o pipefail
 
-declare -a arr=("rest-easy-file-uploading-and-downloading"
+declare -a arr=(
+ "rest-easy-file-uploading-and-downloading"
  "generate-documents-from-word-templates-with-docx4j-on-wildfly14"
  "hello-world-jsf-2.3"
  "embedded-messaging-engine-open-liberty"
@@ -16,7 +17,6 @@ declare -a arr=("rest-easy-file-uploading-and-downloading"
  "jax-rs-api-rate-limiting-with-jsr-375"
  "jpa-integration-tests-java-ee"
  "jsf-simple-login-with-java-ee-security-api"
- "load-testing-your-application"
  "messaging-with-jms-using-payara"
  "microprofile-jwt-keycloak-auth/backend"
  "microprofile-rest-client-for-restful-communication/order-application"
diff --git a/pom.xml b/pom.xml
index cf605f40..caca5ea1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,52 @@
     <module>spring-websocket-integration-tests</module>
     <module>spring-boot-test-mockmvc-webtestclient-testresttemplate</module>
     <module>spring-mockmvc-with-webtestclient</module>
+    <module>load-testing-your-application</module>
+    <module>whats-new-in-spring-boot-2.1</module>
+    <module>whats-new-in-spring-boot-2.2</module>
+    <module>whats-new-in-spring-boot-2.3</module>
+    <module>avoid-repeating-attributes-in-jpa-entities</module>
+    <module>lazy-loading-of-jpa-attributes-with-hibernate</module>
+    <module>send-emails-with-sendgrid-and-spring-boot</module>
+    <module>demo-crud-application</module>
+    <module>deploy-spring-boot-to-gke</module>
+    <module>spring-boot-hibernate-flyway-best-practices</module>
+    <module>spring-boot-with-kotlin</module>
+    <module>difference-between-mock-and-mockbean</module>
+    <module>spring-boot-override-test-properties</module>
+    <module>spring-boot-test-mail-sending</module>
+    <module>spring-boot-shedlock</module>
+    <module>spring-data-mongo-test-testcontainers</module>
+    <module>dynamic-sql-querying-with-pagination</module>
+    <module>spring-boot-integration-tests-testcontainers</module>
+    <module>remote-debugging-spring-boot-application</module>
+    <module>spring-web-client-demo</module>
+    <module>spring-boot-uploading-and-downloading-files-with-react</module>
+    <module>spring-web-client-oauth2-reactive-stack</module>
+    <module>spring-web-client-oauth2-servlet-stack</module>
+    <module>spring-web-test-client</module>
+    <module>spring-web-client-customizing</module>
+    <module>spring-web-client-testing-with-mockwebserver</module>
+    <module>spring-web-client-exchange-retrieve</module>
+    <module>spring-web-test-client</module>
+    <module>maven-plugins-to-ensure-quality</module>
+    <module>github-actions-java-maven</module>
+    <module>spring-web-client-expose-metrics</module>
+    <module>spring-boot-selenium-integration-tests</module>
+    <module>testing-json-serialization-spring</module>
+    <module>spring-web-mvc-cheat-sheet</module>
+    <module>spring-boot-aws-ssm-parameter-resolving</module>
+    <module>spring-security-aws-cognito-thymeleaf</module>
+    <module>testcontainers-reuse-existing-containers</module>
+    <module>spring-test-context-caching-introduction</module>
+    <module>spring-boot-kotlin-testcontainers</module>
+    <module>testing-spring-boot-applications-with-mockmvc</module>
+    <module>write-concise-web-tests-with-selenide</module>
+    <module>spring-boot-test-spring-events</module>
+    <module>spring-boot-testing-tips-and-tricks</module>
+    <module>expose-git-information-actuator</module>
+    <module>dependency-version-update-plugin</module>
+    <module>testing-spring-rest-template</module>
   </modules>
 
   <dependencyManagement>