diff --git a/src/main/resources/generator/server/springboot/cucumber/rest/CucumberRestTemplate.java.mustache b/src/main/resources/generator/server/springboot/cucumber/rest/CucumberRestTemplate.java.mustache
index 7ffa408b416..707f30ecd34 100644
--- a/src/main/resources/generator/server/springboot/cucumber/rest/CucumberRestTemplate.java.mustache
+++ b/src/main/resources/generator/server/springboot/cucumber/rest/CucumberRestTemplate.java.mustache
@@ -36,7 +36,7 @@ public class CucumberRestTemplate {
   }
 
   private HttpHeaders jsonHeaders() {
-    HttpHeaders headers = new HttpHeaders();
+    var headers = new HttpHeaders();
 
     headers.setAccept(List.of(MediaType.APPLICATION_JSON));
     headers.setContentType(MediaType.APPLICATION_JSON);
diff --git a/src/main/resources/generator/server/springboot/cucumber/rest/CucumberRestTestContext.java.mustache b/src/main/resources/generator/server/springboot/cucumber/rest/CucumberRestTestContext.java.mustache
index 90c961a8fc5..acb56b3ce49 100644
--- a/src/main/resources/generator/server/springboot/cucumber/rest/CucumberRestTestContext.java.mustache
+++ b/src/main/resources/generator/server/springboot/cucumber/rest/CucumberRestTestContext.java.mustache
@@ -194,7 +194,7 @@ public final class CucumberRestTestContext {
 
     private void retry() {
       try {
-        ClientHttpResponse clientHttpResponse = execution.execute(request, body);
+        var clientHttpResponse = execution.execute(request, body);
 
         CucumberRestTestContext.addResponse(request, clientHttpResponse, execution, body);
       } catch (IOException e) {
diff --git a/src/main/resources/generator/server/springboot/cucumber/rest/ElementAssertions.java.mustache b/src/main/resources/generator/server/springboot/cucumber/rest/ElementAssertions.java.mustache
index 6fe16e51a5a..6bdbca3c852 100644
--- a/src/main/resources/generator/server/springboot/cucumber/rest/ElementAssertions.java.mustache
+++ b/src/main/resources/generator/server/springboot/cucumber/rest/ElementAssertions.java.mustache
@@ -59,7 +59,7 @@ class ElementAssertions {
   <Data> void containing(List<Map<String, Data>> responses) {
     assertThat(responses).as("Can't check object against null responses").isNotNull();
 
-    for (int line = 0; line < responses.size(); line++) {
+    for (var line = 0; line < responses.size(); line++) {
       for (Map.Entry<String, Data> entry : responses.get(line).entrySet()) {
         String path = jsonPath + "[" + line + "]." + CucumberJson.toCamelCase(entry.getKey());
 
diff --git a/src/main/resources/generator/server/springboot/cucumberauthentication/jwt/AuthenticationSteps.java.mustache b/src/main/resources/generator/server/springboot/cucumberauthentication/jwt/AuthenticationSteps.java.mustache
index 810fd9e350b..7a55a9a1423 100644
--- a/src/main/resources/generator/server/springboot/cucumberauthentication/jwt/AuthenticationSteps.java.mustache
+++ b/src/main/resources/generator/server/springboot/cucumberauthentication/jwt/AuthenticationSteps.java.mustache
@@ -43,7 +43,7 @@ public class AuthenticationSteps {
   private List<ClientHttpRequestInterceptor> interceptorsWithAuthentication(String user) {
     List<ClientHttpRequestInterceptor> interceptors = new ArrayList<>(rest.getRestTemplate().getInterceptors());
 
-    User userToAuthenticate = users.get(user);
+    var userToAuthenticate = users.get(user);
 
     assertThat(userToAuthenticate).as(unknownUserMessage(user)).isNotNull();
 
diff --git a/src/main/resources/generator/server/springboot/cucumberauthentication/oauth2/AuthenticationSteps.java.mustache b/src/main/resources/generator/server/springboot/cucumberauthentication/oauth2/AuthenticationSteps.java.mustache
index 473322db427..82dde2ef8f8 100644
--- a/src/main/resources/generator/server/springboot/cucumberauthentication/oauth2/AuthenticationSteps.java.mustache
+++ b/src/main/resources/generator/server/springboot/cucumberauthentication/oauth2/AuthenticationSteps.java.mustache
@@ -35,7 +35,7 @@ public class AuthenticationSteps {
   private List<ClientHttpRequestInterceptor> interceptorsWithAuthentication(String user) {
     List<ClientHttpRequestInterceptor> interceptors = new ArrayList<>(rest.getRestTemplate().getInterceptors());
 
-    User userToAuthenticate = users.get(user);
+    var userToAuthenticate = users.get(user);
 
     assertThat(userToAuthenticate).as(unknownUserMessage(user)).isNotNull();
 
diff --git a/src/main/resources/generator/server/springboot/dbmigration/liquibase/test/AsyncSpringLiquibaseTest.java.mustache b/src/main/resources/generator/server/springboot/dbmigration/liquibase/test/AsyncSpringLiquibaseTest.java.mustache
index 58d4c619a6e..dc60f8f8201 100644
--- a/src/main/resources/generator/server/springboot/dbmigration/liquibase/test/AsyncSpringLiquibaseTest.java.mustache
+++ b/src/main/resources/generator/server/springboot/dbmigration/liquibase/test/AsyncSpringLiquibaseTest.java.mustache
@@ -105,7 +105,7 @@ class AsyncSpringLiquibaseTest {
     @Test
     void shouldWarnWhenLiquibaseExecutionIsSlow() throws LiquibaseException {
       liquibaseProperties.setEnabled(true);
-      Duration slownessThreshold = Duration.ofMillis(50);
+      var slownessThreshold = Duration.ofMillis(50);
       TestAsyncSpringLiquibase asyncSpringLiquibase = spy(
         new TestAsyncSpringLiquibase(executor, environment, liquibaseProperties, slownessThreshold)
       );
diff --git a/src/main/resources/generator/server/springboot/mvc/security/jwt/authentication/test/application/AuthenticatedUserTest.java.mustache b/src/main/resources/generator/server/springboot/mvc/security/jwt/authentication/test/application/AuthenticatedUserTest.java.mustache
index a8ab8d3477d..6b0c65520aa 100644
--- a/src/main/resources/generator/server/springboot/mvc/security/jwt/authentication/test/application/AuthenticatedUserTest.java.mustache
+++ b/src/main/resources/generator/server/springboot/mvc/security/jwt/authentication/test/application/AuthenticatedUserTest.java.mustache
@@ -106,7 +106,7 @@ class AuthenticatedUserTest {
 
   private static UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken() {
     Collection<GrantedAuthority> authorities = adminAuthorities();
-    User user = new User("admin", "admin", authorities);
+    var user = new User("admin", "admin", authorities);
 
     return new UsernamePasswordAuthenticationToken(user, "admin", authorities);
   }
diff --git a/src/main/resources/generator/server/springboot/mvc/security/oauth2/core/main/infrastructure/primary/CustomClaimConverter.java.mustache b/src/main/resources/generator/server/springboot/mvc/security/oauth2/core/main/infrastructure/primary/CustomClaimConverter.java.mustache
index 2edc4da3275..dbcd512f584 100644
--- a/src/main/resources/generator/server/springboot/mvc/security/oauth2/core/main/infrastructure/primary/CustomClaimConverter.java.mustache
+++ b/src/main/resources/generator/server/springboot/mvc/security/oauth2/core/main/infrastructure/primary/CustomClaimConverter.java.mustache
@@ -75,7 +75,7 @@ class CustomClaimConverter implements Converter<Map<String, Object>, Map<String,
   }
 
   private ObjectNode loadUser(ClientRegistration registration, RestTemplate restTemplate, SubAttributes subAttributes) {
-    HttpHeaders headers = new HttpHeaders();
+    var headers = new HttpHeaders();
     headers.set(HttpHeaders.AUTHORIZATION, buildBearer(getToken(subAttributes.attributes)));
 
     ResponseEntity<ObjectNode> userInfo = restTemplate.exchange(
diff --git a/src/main/resources/generator/server/springboot/mvc/security/oauth2/core/test/application/AuthenticatedUserTest.java.mustache b/src/main/resources/generator/server/springboot/mvc/security/oauth2/core/test/application/AuthenticatedUserTest.java.mustache
index 0171765ced9..041211d2de5 100644
--- a/src/main/resources/generator/server/springboot/mvc/security/oauth2/core/test/application/AuthenticatedUserTest.java.mustache
+++ b/src/main/resources/generator/server/springboot/mvc/security/oauth2/core/test/application/AuthenticatedUserTest.java.mustache
@@ -185,7 +185,7 @@ class AuthenticatedUserTest {
 
   private static UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken() {
     Collection<GrantedAuthority> authorities = adminAuthorities();
-    User user = new User("admin", "admin", authorities);
+    var user = new User("admin", "admin", authorities);
 
     return new UsernamePasswordAuthenticationToken(user, "admin", authorities);
   }
diff --git a/src/main/resources/generator/server/springboot/webflux/web/main/HeaderUtil.java.mustache b/src/main/resources/generator/server/springboot/webflux/web/main/HeaderUtil.java.mustache
index e63051acedb..ee5fd130069 100644
--- a/src/main/resources/generator/server/springboot/webflux/web/main/HeaderUtil.java.mustache
+++ b/src/main/resources/generator/server/springboot/webflux/web/main/HeaderUtil.java.mustache
@@ -29,7 +29,7 @@ public final class HeaderUtil {
     String message = "error." + errorKey;
     log.error("Entity processing failed, {}", message);
 
-    HttpHeaders headers = new HttpHeaders();
+    var headers = new HttpHeaders();
     headers.add("X-" + applicationName + "-error", message);
     headers.add("X-" + applicationName + "-params", entityName);
     
diff --git a/src/test/java/tech/jhipster/lite/cucumber/rest/CucumberRestTestContext.java b/src/test/java/tech/jhipster/lite/cucumber/rest/CucumberRestTestContext.java
index 0936675f80b..c9a74513d79 100644
--- a/src/test/java/tech/jhipster/lite/cucumber/rest/CucumberRestTestContext.java
+++ b/src/test/java/tech/jhipster/lite/cucumber/rest/CucumberRestTestContext.java
@@ -200,7 +200,7 @@ private boolean forUri(String uri) {
 
     private void retry() {
       try {
-        ClientHttpResponse clientHttpResponse = execution.execute(request, body);
+        var clientHttpResponse = execution.execute(request, body);
 
         addResponse(request, clientHttpResponse, execution, body);
       } catch (IOException e) {
diff --git a/src/test/java/tech/jhipster/lite/cucumber/rest/ElementAssertions.java b/src/test/java/tech/jhipster/lite/cucumber/rest/ElementAssertions.java
index ff56f098af0..3d31c14a4f7 100644
--- a/src/test/java/tech/jhipster/lite/cucumber/rest/ElementAssertions.java
+++ b/src/test/java/tech/jhipster/lite/cucumber/rest/ElementAssertions.java
@@ -60,7 +60,7 @@ void withMoreThanElementsCount(int count) {
   <Data> void containing(List<Map<String, Data>> responses) {
     assertThat(responses).as("Can't check object against null responses").isNotNull();
 
-    for (int line = 0; line < responses.size(); line++) {
+    for (var line = 0; line < responses.size(); line++) {
       for (Map.Entry<String, Data> entry : responses.get(line).entrySet()) {
         String path = jsonPath + "[" + line + "]." + CucumberJson.toCamelCase(entry.getKey());
 
diff --git a/src/test/java/tech/jhipster/lite/module/infrastructure/primary/ModulesSteps.java b/src/test/java/tech/jhipster/lite/module/infrastructure/primary/ModulesSteps.java
index 8fba24a52fc..0bdcb49a429 100644
--- a/src/test/java/tech/jhipster/lite/module/infrastructure/primary/ModulesSteps.java
+++ b/src/test/java/tech/jhipster/lite/module/infrastructure/primary/ModulesSteps.java
@@ -229,7 +229,7 @@ private void post(String uri, String content) {
   }
 
   private HttpHeaders jsonHeaders() {
-    HttpHeaders headers = new HttpHeaders();
+    var headers = new HttpHeaders();
 
     headers.setAccept(List.of(MediaType.APPLICATION_JSON));
     headers.setContentType(MediaType.APPLICATION_JSON);
diff --git a/src/test/java/tech/jhipster/lite/project/infrastructure/primary/ProjectsSteps.java b/src/test/java/tech/jhipster/lite/project/infrastructure/primary/ProjectsSteps.java
index 33c08ddac38..b3b9e741e93 100644
--- a/src/test/java/tech/jhipster/lite/project/infrastructure/primary/ProjectsSteps.java
+++ b/src/test/java/tech/jhipster/lite/project/infrastructure/primary/ProjectsSteps.java
@@ -32,7 +32,7 @@ public void downloadCreatedProject() {
   }
 
   private HttpHeaders octetsHeaders() {
-    HttpHeaders headers = new HttpHeaders();
+    var headers = new HttpHeaders();
 
     headers.setAccept(List.of(MediaType.APPLICATION_OCTET_STREAM));
     headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
@@ -51,7 +51,7 @@ public void getCreatedProjectInformation() {
   }
 
   private HttpHeaders jsonHeaders() {
-    HttpHeaders headers = new HttpHeaders();
+    var headers = new HttpHeaders();
 
     headers.setAccept(List.of(MediaType.APPLICATION_JSON));
     headers.setContentType(MediaType.APPLICATION_JSON);