diff --git a/.github/workflows/spring-boot-httpClients-web-client-webmvc.yml b/.github/workflows/httpClients-boot-web-client-webmvc.yml
similarity index 70%
rename from .github/workflows/spring-boot-httpClients-web-client-webmvc.yml
rename to .github/workflows/httpClients-boot-web-client-webmvc.yml
index f6814f88d..cfe3c07e8 100644
--- a/.github/workflows/spring-boot-httpClients-web-client-webmvc.yml
+++ b/.github/workflows/httpClients-boot-web-client-webmvc.yml
@@ -1,12 +1,12 @@
-name: spring-boot-httpClients-web-client-mvc
+name: httpClients-boot-web-client-mvc
 on:
   push:
     paths:
-      - "httpClients/web-client-mvc/**"
+      - "httpClients/boot-web-client-mvc/**"
     branches: [main]
   pull_request:
     paths:
-      - "httpClients/web-client-mvc/**"
+      - "httpClients/boot-web-client-mvc/**"
     types:
       - opened
       - synchronize
@@ -18,16 +18,16 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: "httpClients/web-client-mvc"
+        working-directory: "httpClients/boot-web-client-mvc"
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3.13.0
         with:
-          java-version: 17
+          java-version: 21
           distribution: "zulu"
           cache: "maven"
       - name: Build and analyze
diff --git a/SUMMARY.md b/SUMMARY.md
index 9c75d593f..7abec5e51 100644
--- a/SUMMARY.md
+++ b/SUMMARY.md
@@ -9,7 +9,7 @@
   * [http-proxy](httpClients/boot-http-proxy/README.md)
   * [rest-client](httpClients/boot-restclient/README.md)
   * [rest-template](httpClients/boot-rest-template/README.md)
-  * [web-client-mvc](httpClients/web-client-mvc/README.md)
+  * [web-client-mvc](httpClients/boot-web-client-mvc/README.md)
   * [web-client-webflux](httpClients/web-client-webflux/README.md)
 * [jmh-benchmark](jmh-benchmark/README.md)
 * [open-api-spring-boot](open-api-spring-boot/README.md)
diff --git a/httpClients/web-client-mvc/.github/workflows/maven.yml b/httpClients/boot-web-client-mvc/.github/workflows/maven.yml
similarity index 100%
rename from httpClients/web-client-mvc/.github/workflows/maven.yml
rename to httpClients/boot-web-client-mvc/.github/workflows/maven.yml
diff --git a/httpClients/web-client-mvc/.gitignore b/httpClients/boot-web-client-mvc/.gitignore
similarity index 100%
rename from httpClients/web-client-mvc/.gitignore
rename to httpClients/boot-web-client-mvc/.gitignore
diff --git a/httpClients/web-client-mvc/.mvn/wrapper/maven-wrapper.jar b/httpClients/boot-web-client-mvc/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from httpClients/web-client-mvc/.mvn/wrapper/maven-wrapper.jar
rename to httpClients/boot-web-client-mvc/.mvn/wrapper/maven-wrapper.jar
diff --git a/httpClients/web-client-mvc/.mvn/wrapper/maven-wrapper.properties b/httpClients/boot-web-client-mvc/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from httpClients/web-client-mvc/.mvn/wrapper/maven-wrapper.properties
rename to httpClients/boot-web-client-mvc/.mvn/wrapper/maven-wrapper.properties
diff --git a/httpClients/web-client-mvc/.yo-rc.json b/httpClients/boot-web-client-mvc/.yo-rc.json
similarity index 88%
rename from httpClients/web-client-mvc/.yo-rc.json
rename to httpClients/boot-web-client-mvc/.yo-rc.json
index acf5486fc..f4f9b951c 100644
--- a/httpClients/web-client-mvc/.yo-rc.json
+++ b/httpClients/boot-web-client-mvc/.yo-rc.json
@@ -1,6 +1,6 @@
 {
   "generator-springboot": {
-    "appName": "web-client-mvc",
+    "appName": "boot-web-client-mvc",
     "packageName": "com.example.rest.webclient",
     "databaseType": "postgresql",
     "dbMigrationTool": "flywaydb",
diff --git a/httpClients/web-client-mvc/Dockerfile b/httpClients/boot-web-client-mvc/Dockerfile
similarity index 90%
rename from httpClients/web-client-mvc/Dockerfile
rename to httpClients/boot-web-client-mvc/Dockerfile
index f432e660d..746ddfe9b 100644
--- a/httpClients/web-client-mvc/Dockerfile
+++ b/httpClients/boot-web-client-mvc/Dockerfile
@@ -1,6 +1,6 @@
 FROM eclipse-temurin:17.0.8_7-jre-focal as builder
 WORKDIR application
-ARG JAR_FILE=target/web-client-mvc-0.0.1-SNAPSHOT.jar
+ARG JAR_FILE=target/boot-web-client-mvc-0.0.1-SNAPSHOT.jar
 COPY ${JAR_FILE} application.jar
 RUN java -Djarmode=layertools -jar application.jar extract
 
diff --git a/httpClients/web-client-mvc/Jenkinsfile b/httpClients/boot-web-client-mvc/Jenkinsfile
similarity index 82%
rename from httpClients/web-client-mvc/Jenkinsfile
rename to httpClients/boot-web-client-mvc/Jenkinsfile
index 08c3babfa..2354b40d5 100644
--- a/httpClients/web-client-mvc/Jenkinsfile
+++ b/httpClients/boot-web-client-mvc/Jenkinsfile
@@ -6,7 +6,7 @@ pipeline {
     }
 
     environment {
-        APPLICATION_NAME = 'web-client-mvc'
+        APPLICATION_NAME = 'boot-web-client-mvc'
     }
 
     stages {
diff --git a/httpClients/web-client-mvc/README.md b/httpClients/boot-web-client-mvc/README.md
similarity index 93%
rename from httpClients/web-client-mvc/README.md
rename to httpClients/boot-web-client-mvc/README.md
index a1b7ee8f4..77569272a 100644
--- a/httpClients/web-client-mvc/README.md
+++ b/httpClients/boot-web-client-mvc/README.md
@@ -1,4 +1,4 @@
-# web-client-mvc
+# boot-web-client-mvc
 
 ### Run tests
 `$ ./mvnw clean verify`
diff --git a/httpClients/web-client-mvc/docker/docker-compose-app.yml b/httpClients/boot-web-client-mvc/docker/docker-compose-app.yml
similarity index 100%
rename from httpClients/web-client-mvc/docker/docker-compose-app.yml
rename to httpClients/boot-web-client-mvc/docker/docker-compose-app.yml
diff --git a/httpClients/web-client-mvc/docker/docker-compose.yml b/httpClients/boot-web-client-mvc/docker/docker-compose.yml
similarity index 100%
rename from httpClients/web-client-mvc/docker/docker-compose.yml
rename to httpClients/boot-web-client-mvc/docker/docker-compose.yml
diff --git a/httpClients/web-client-mvc/lombok.config b/httpClients/boot-web-client-mvc/lombok.config
similarity index 100%
rename from httpClients/web-client-mvc/lombok.config
rename to httpClients/boot-web-client-mvc/lombok.config
diff --git a/httpClients/web-client-mvc/mvnw b/httpClients/boot-web-client-mvc/mvnw
similarity index 100%
rename from httpClients/web-client-mvc/mvnw
rename to httpClients/boot-web-client-mvc/mvnw
diff --git a/httpClients/web-client-mvc/mvnw.cmd b/httpClients/boot-web-client-mvc/mvnw.cmd
similarity index 100%
rename from httpClients/web-client-mvc/mvnw.cmd
rename to httpClients/boot-web-client-mvc/mvnw.cmd
diff --git a/httpClients/web-client-mvc/pom.xml b/httpClients/boot-web-client-mvc/pom.xml
similarity index 98%
rename from httpClients/web-client-mvc/pom.xml
rename to httpClients/boot-web-client-mvc/pom.xml
index 3418b3505..e52fc908e 100644
--- a/httpClients/web-client-mvc/pom.xml
+++ b/httpClients/boot-web-client-mvc/pom.xml
@@ -5,20 +5,20 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.5</version>
+        <version>3.2.0-RC1</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example.rest.webclient</groupId>
-    <artifactId>web-client-mvc</artifactId>
+    <artifactId>boot-web-client-mvc</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>web-client-mvc</name>
-    <description>web- in mvc</description>
+    <name>boot-web-client-mvc</name>
+    <description>webclient demo using mvc</description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <springdoc-openapi.version>2.2.0</springdoc-openapi.version>
 
         <project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
diff --git a/httpClients/web-client-mvc/sonar-project.properties b/httpClients/boot-web-client-mvc/sonar-project.properties
similarity index 100%
rename from httpClients/web-client-mvc/sonar-project.properties
rename to httpClients/boot-web-client-mvc/sonar-project.properties
diff --git a/httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/Application.java b/httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/Application.java
similarity index 100%
rename from httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/Application.java
rename to httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/Application.java
diff --git a/httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/config/ApplicationProperties.java b/httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/config/ApplicationProperties.java
similarity index 100%
rename from httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/config/ApplicationProperties.java
rename to httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/config/ApplicationProperties.java
diff --git a/httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/config/Initializer.java b/httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/config/Initializer.java
similarity index 100%
rename from httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/config/Initializer.java
rename to httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/config/Initializer.java
diff --git a/httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/config/SwaggerConfig.java b/httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/config/SwaggerConfig.java
similarity index 100%
rename from httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/config/SwaggerConfig.java
rename to httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/config/SwaggerConfig.java
diff --git a/httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/config/WebClientConfiguration.java b/httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/config/WebClientConfiguration.java
similarity index 100%
rename from httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/config/WebClientConfiguration.java
rename to httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/config/WebClientConfiguration.java
diff --git a/httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/config/WebMvcConfig.java b/httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/config/WebMvcConfig.java
similarity index 100%
rename from httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/config/WebMvcConfig.java
rename to httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/config/WebMvcConfig.java
diff --git a/httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/config/logging/Loggable.java b/httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/config/logging/Loggable.java
similarity index 100%
rename from httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/config/logging/Loggable.java
rename to httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/config/logging/Loggable.java
diff --git a/httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/config/logging/LoggingAspect.java b/httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/config/logging/LoggingAspect.java
similarity index 100%
rename from httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/config/logging/LoggingAspect.java
rename to httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/config/logging/LoggingAspect.java
diff --git a/httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/exception/ErrorDetailProblemHandlingControllerAdvice.java b/httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/exception/ErrorDetailProblemHandlingControllerAdvice.java
similarity index 100%
rename from httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/exception/ErrorDetailProblemHandlingControllerAdvice.java
rename to httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/exception/ErrorDetailProblemHandlingControllerAdvice.java
diff --git a/httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/model/response/PostDto.java b/httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/model/response/PostDto.java
similarity index 100%
rename from httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/model/response/PostDto.java
rename to httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/model/response/PostDto.java
diff --git a/httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/services/PostService.java b/httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/services/PostService.java
similarity index 100%
rename from httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/services/PostService.java
rename to httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/services/PostService.java
diff --git a/httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/utils/AppConstants.java b/httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/utils/AppConstants.java
similarity index 100%
rename from httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/utils/AppConstants.java
rename to httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/utils/AppConstants.java
diff --git a/httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/web/controllers/PostController.java b/httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/web/controllers/PostController.java
similarity index 100%
rename from httpClients/web-client-mvc/src/main/java/com/example/rest/webclient/web/controllers/PostController.java
rename to httpClients/boot-web-client-mvc/src/main/java/com/example/rest/webclient/web/controllers/PostController.java
diff --git a/httpClients/web-client-mvc/src/main/resources/application-heroku.properties b/httpClients/boot-web-client-mvc/src/main/resources/application-heroku.properties
similarity index 100%
rename from httpClients/web-client-mvc/src/main/resources/application-heroku.properties
rename to httpClients/boot-web-client-mvc/src/main/resources/application-heroku.properties
diff --git a/httpClients/web-client-mvc/src/main/resources/application-local.properties b/httpClients/boot-web-client-mvc/src/main/resources/application-local.properties
similarity index 100%
rename from httpClients/web-client-mvc/src/main/resources/application-local.properties
rename to httpClients/boot-web-client-mvc/src/main/resources/application-local.properties
diff --git a/httpClients/web-client-mvc/src/main/resources/application.properties b/httpClients/boot-web-client-mvc/src/main/resources/application.properties
similarity index 94%
rename from httpClients/web-client-mvc/src/main/resources/application.properties
rename to httpClients/boot-web-client-mvc/src/main/resources/application.properties
index f12436e9f..6a0bcbe79 100644
--- a/httpClients/web-client-mvc/src/main/resources/application.properties
+++ b/httpClients/boot-web-client-mvc/src/main/resources/application.properties
@@ -1,11 +1,11 @@
-spring.application.name=web-client-mvc
+spring.application.name=boot-web-client-mvc
 server.port=8080
 server.shutdown=graceful
 spring.main.allow-bean-definition-overriding=true
 spring.jmx.enabled=false
 
 ################ Logging #####################
-logging.file.name=logs/web-client-mvc.log
+logging.file.name=logs/${spring.application.name}.log
 logging.level.web=INFO
 logging.level.sql=INFO
 ## To enable transaction details logging
diff --git a/httpClients/web-client-mvc/src/main/resources/db/migration/h2/V1__01_init.sql b/httpClients/boot-web-client-mvc/src/main/resources/db/migration/h2/V1__01_init.sql
similarity index 100%
rename from httpClients/web-client-mvc/src/main/resources/db/migration/h2/V1__01_init.sql
rename to httpClients/boot-web-client-mvc/src/main/resources/db/migration/h2/V1__01_init.sql
diff --git a/httpClients/web-client-mvc/src/main/resources/db/migration/h2/V2__create_posts_table.sql b/httpClients/boot-web-client-mvc/src/main/resources/db/migration/h2/V2__create_posts_table.sql
similarity index 100%
rename from httpClients/web-client-mvc/src/main/resources/db/migration/h2/V2__create_posts_table.sql
rename to httpClients/boot-web-client-mvc/src/main/resources/db/migration/h2/V2__create_posts_table.sql
diff --git a/httpClients/web-client-mvc/src/main/resources/db/migration/postgresql/V1__01_init.sql b/httpClients/boot-web-client-mvc/src/main/resources/db/migration/postgresql/V1__01_init.sql
similarity index 100%
rename from httpClients/web-client-mvc/src/main/resources/db/migration/postgresql/V1__01_init.sql
rename to httpClients/boot-web-client-mvc/src/main/resources/db/migration/postgresql/V1__01_init.sql
diff --git a/httpClients/web-client-mvc/src/main/resources/db/migration/postgresql/V2__create_posts_table.sql b/httpClients/boot-web-client-mvc/src/main/resources/db/migration/postgresql/V2__create_posts_table.sql
similarity index 100%
rename from httpClients/web-client-mvc/src/main/resources/db/migration/postgresql/V2__create_posts_table.sql
rename to httpClients/boot-web-client-mvc/src/main/resources/db/migration/postgresql/V2__create_posts_table.sql
diff --git a/httpClients/web-client-mvc/src/main/resources/logback-spring.xml b/httpClients/boot-web-client-mvc/src/main/resources/logback-spring.xml
similarity index 100%
rename from httpClients/web-client-mvc/src/main/resources/logback-spring.xml
rename to httpClients/boot-web-client-mvc/src/main/resources/logback-spring.xml
diff --git a/httpClients/web-client-mvc/src/test/java/com/example/rest/webclient/ApplicationIntegrationTest.java b/httpClients/boot-web-client-mvc/src/test/java/com/example/rest/webclient/ApplicationIntegrationTest.java
similarity index 100%
rename from httpClients/web-client-mvc/src/test/java/com/example/rest/webclient/ApplicationIntegrationTest.java
rename to httpClients/boot-web-client-mvc/src/test/java/com/example/rest/webclient/ApplicationIntegrationTest.java
diff --git a/httpClients/web-client-mvc/src/test/java/com/example/rest/webclient/common/AbstractIntegrationTest.java b/httpClients/boot-web-client-mvc/src/test/java/com/example/rest/webclient/common/AbstractIntegrationTest.java
similarity index 100%
rename from httpClients/web-client-mvc/src/test/java/com/example/rest/webclient/common/AbstractIntegrationTest.java
rename to httpClients/boot-web-client-mvc/src/test/java/com/example/rest/webclient/common/AbstractIntegrationTest.java
diff --git a/httpClients/web-client-mvc/src/test/java/com/example/rest/webclient/web/controllers/PostControllerTest.java b/httpClients/boot-web-client-mvc/src/test/java/com/example/rest/webclient/web/controllers/PostControllerTest.java
similarity index 100%
rename from httpClients/web-client-mvc/src/test/java/com/example/rest/webclient/web/controllers/PostControllerTest.java
rename to httpClients/boot-web-client-mvc/src/test/java/com/example/rest/webclient/web/controllers/PostControllerTest.java
diff --git a/httpClients/web-client-mvc/src/test/resources/application-test.properties b/httpClients/boot-web-client-mvc/src/test/resources/application-test.properties
similarity index 100%
rename from httpClients/web-client-mvc/src/test/resources/application-test.properties
rename to httpClients/boot-web-client-mvc/src/test/resources/application-test.properties
diff --git a/httpClients/web-client-mvc/src/test/resources/logback-test.xml b/httpClients/boot-web-client-mvc/src/test/resources/logback-test.xml
similarity index 100%
rename from httpClients/web-client-mvc/src/test/resources/logback-test.xml
rename to httpClients/boot-web-client-mvc/src/test/resources/logback-test.xml
diff --git a/pom.xml b/pom.xml
index 665b057c5..6c1396bf3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
         <module>httpClients/boot-http-proxy</module>
         <module>httpClients/boot-restclient</module>
         <module>httpClients/boot-rest-template</module>
-        <module>httpClients/web-client-mvc</module>
+        <module>httpClients/boot-web-client-mvc</module>
         <module>httpClients/web-client-webflux</module>
         <module>jpa/boot-data-customsequence</module>
         <module>jpa/boot-data-multipledatasources</module>