diff --git a/{{app_name}}/acceptance-test/pom.xml.jinja b/{{app_name}}/acceptance-test/pom.xml.jinja
index 9707b05..e65a689 100644
--- a/{{app_name}}/acceptance-test/pom.xml.jinja
+++ b/{{app_name}}/acceptance-test/pom.xml.jinja
@@ -37,6 +37,11 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-resttestclient</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
diff --git a/{{app_name}}/acceptance-test/src/test/java/{{package_name}}/cucumber/SpringCucumberTestConfig.java.jinja b/{{app_name}}/acceptance-test/src/test/java/{{package_name}}/cucumber/SpringCucumberTestConfig.java.jinja
index 08bdb38..b823227 100644
--- a/{{app_name}}/acceptance-test/src/test/java/{{package_name}}/cucumber/SpringCucumberTestConfig.java.jinja
+++ b/{{app_name}}/acceptance-test/src/test/java/{{package_name}}/cucumber/SpringCucumberTestConfig.java.jinja
@@ -3,6 +3,7 @@ package {{package_name}}.cucumber;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
 import io.cucumber.spring.CucumberContextConfiguration;
+import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import {{package_name}}.boot.{{domain_capitalized}}Application;
@@ -10,4 +11,5 @@ import {{package_name}}.boot.{{domain_capitalized}}Application;
 @SpringBootTest(classes = {{domain_capitalized}}Application.class, webEnvironment = RANDOM_PORT)
 @CucumberContextConfiguration
 @ActiveProfiles("test")
+@AutoConfigureTestRestTemplate
 public class SpringCucumberTestConfig {}
diff --git a/{{app_name}}/acceptance-test/src/test/java/{{package_name}}/cucumber/{{domain_capitalized}}StepDef.java.jinja b/{{app_name}}/acceptance-test/src/test/java/{{package_name}}/cucumber/{{domain_capitalized}}StepDef.java.jinja
index e992d5b..56dc9fc 100644
--- a/{{app_name}}/acceptance-test/src/test/java/{{package_name}}/cucumber/{{domain_capitalized}}StepDef.java.jinja
+++ b/{{app_name}}/acceptance-test/src/test/java/{{package_name}}/cucumber/{{domain_capitalized}}StepDef.java.jinja
@@ -11,7 +11,7 @@ import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.resttestclient.TestRestTemplate;
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/{{app_name}}/jpa-adapter/pom.xml.jinja b/{{app_name}}/jpa-adapter/pom.xml.jinja
index 310c326..e66900c 100644
--- a/{{app_name}}/jpa-adapter/pom.xml.jinja
+++ b/{{app_name}}/jpa-adapter/pom.xml.jinja
@@ -21,12 +21,12 @@
       <artifactId>spring-boot-starter-data-jpa</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.liquibase</groupId>
-      <artifactId>liquibase-core</artifactId>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-liquibase</artifactId>
       <exclusions>
         <exclusion>
-          <artifactId>commons-text</artifactId>
           <groupId>org.apache.commons</groupId>
+          <artifactId>commons-text</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -53,6 +53,11 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-data-jpa-test</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
diff --git a/{{app_name}}/jpa-adapter/src/main/java/{{package_name}}/repository/config/JpaAdapterConfig.java.jinja b/{{app_name}}/jpa-adapter/src/main/java/{{package_name}}/repository/config/JpaAdapterConfig.java.jinja
index 7a270e7..9c4c70b 100644
--- a/{{app_name}}/jpa-adapter/src/main/java/{{package_name}}/repository/config/JpaAdapterConfig.java.jinja
+++ b/{{app_name}}/jpa-adapter/src/main/java/{{package_name}}/repository/config/JpaAdapterConfig.java.jinja
@@ -1,6 +1,6 @@
 package {{package_name}}.repository.config;
 
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.envers.repository.support.EnversRevisionRepositoryFactoryBean;
diff --git a/{{app_name}}/jpa-adapter/src/main/resources/preliquibase/default.sql.jinja b/{{app_name}}/jpa-adapter/src/main/resources/preliquibase/h2.sql.jinja
similarity index 100%
rename from {{app_name}}/jpa-adapter/src/main/resources/preliquibase/default.sql.jinja
rename to {{app_name}}/jpa-adapter/src/main/resources/preliquibase/h2.sql.jinja
diff --git a/{{app_name}}/jpa-adapter/src/test/java/{{package_name}}/repository/{{domain_capitalized}}JpaAdapterApplication.java.jinja b/{{app_name}}/jpa-adapter/src/test/java/{{package_name}}/repository/{{domain_capitalized}}JpaAdapterApplication.java.jinja
index 7aa3f28..963877d 100644
--- a/{{app_name}}/jpa-adapter/src/test/java/{{package_name}}/repository/{{domain_capitalized}}JpaAdapterApplication.java.jinja
+++ b/{{app_name}}/jpa-adapter/src/test/java/{{package_name}}/repository/{{domain_capitalized}}JpaAdapterApplication.java.jinja
@@ -1,8 +1,6 @@
 package {{package_name}}.repository;
 
-import net.lbruun.springboot.preliquibase.PreLiquibaseAutoConfiguration;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Import;
@@ -17,6 +15,5 @@ public class {{domain_capitalized}}JpaAdapterApplication {
 
   @TestConfiguration
   @Import(JpaAdapterConfig.class)
-  @ImportAutoConfiguration({PreLiquibaseAutoConfiguration.class})
   static class {{domain_capitalized}}JpaTestConfig {}
 }
diff --git a/{{app_name}}/jpa-adapter/src/test/java/{{package_name}}/repository/{{domain_capitalized}}JpaTest.java.jinja b/{{app_name}}/jpa-adapter/src/test/java/{{package_name}}/repository/{{domain_capitalized}}JpaTest.java.jinja
index ad36dca..9c28a38 100644
--- a/{{app_name}}/jpa-adapter/src/test/java/{{package_name}}/repository/{{domain_capitalized}}JpaTest.java.jinja
+++ b/{{app_name}}/jpa-adapter/src/test/java/{{package_name}}/repository/{{domain_capitalized}}JpaTest.java.jinja
@@ -6,7 +6,7 @@ import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.jdbc.Sql;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
diff --git a/{{app_name}}/pom.xml.jinja b/{{app_name}}/pom.xml.jinja
index 876f5be..92951f2 100644
--- a/{{app_name}}/pom.xml.jinja
+++ b/{{app_name}}/pom.xml.jinja
@@ -13,13 +13,11 @@
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <junit-jupiter.version>6.0.1</junit-jupiter.version>
-    <spring-boot.version>3.5.7</spring-boot.version>
-    <cucumber.version>7.31.0</cucumber.version>
-    <springdoc-openapi-starter.version>2.8.14</springdoc-openapi-starter.version>
-    <pre-liquibase.version>1.6.1</pre-liquibase.version>
+    <spring-boot.version>4.0.0</spring-boot.version>
+    <cucumber.version>7.32.0</cucumber.version>
+    <springdoc-openapi-starter.version>3.0.0</springdoc-openapi-starter.version>
+    <pre-liquibase.version>2.0.0</pre-liquibase.version>
     <otj-pg-embedded.version>1.1.1</otj-pg-embedded.version>
-    <snakeyaml.version>2.4</snakeyaml.version>
-    <h2.version>2.3.232</h2.version>
     <apache.commons.version>1.14.0</apache.commons.version>
     <!-- plugins -->
     <cukedoctor-maven-plugin.version>3.9.0</cukedoctor-maven-plugin.version>
@@ -28,10 +26,10 @@
     <arch-unit-maven-plugin.version>4.0.2</arch-unit-maven-plugin.version>
     <jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
     <maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
-    <jib-maven.plugin.version>3.4.6</jib-maven.plugin.version>
+    <jib-maven.plugin.version>3.5.1</jib-maven.plugin.version>
     <git-code-format-maven-plugin.version>5.4</git-code-format-maven-plugin.version>
     <githook-maven-plugin.version>1.0.5</githook-maven-plugin.version>
-    <pitest-maven-plugin.version>1.21.1</pitest-maven-plugin.version>
+    <pitest-maven-plugin.version>1.22.0</pitest-maven-plugin.version>
     <pitest-junit5-plugin.version>1.2.3</pitest-junit5-plugin.version>
   </properties>
   <modules>
@@ -153,6 +151,12 @@
         <configuration>
           <source>${java.version}</source> <!-- 1.8,1.9,1.10,11,12,13 -->
           <target>${java.version}</target>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>org.projectlombok</groupId>
+              <artifactId>lombok</artifactId>
+            </path>
+          </annotationProcessorPaths>
         </configuration>
       </plugin>
       <plugin>
diff --git a/{{app_name}}/rest-adapter/pom.xml.jinja b/{{app_name}}/rest-adapter/pom.xml.jinja
index acb510e..79d873e 100644
--- a/{{app_name}}/rest-adapter/pom.xml.jinja
+++ b/{{app_name}}/rest-adapter/pom.xml.jinja
@@ -35,6 +35,11 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-resttestclient</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/{{app_name}}/rest-adapter/src/test/java/{{package_name}}/rest/{{domain_capitalized}}ResourceTest.java.jinja b/{{app_name}}/rest-adapter/src/test/java/{{package_name}}/rest/{{domain_capitalized}}ResourceTest.java.jinja
index 419a002..4d2512c 100644
--- a/{{app_name}}/rest-adapter/src/test/java/{{package_name}}/rest/{{domain_capitalized}}ResourceTest.java.jinja
+++ b/{{app_name}}/rest-adapter/src/test/java/{{package_name}}/rest/{{domain_capitalized}}ResourceTest.java.jinja
@@ -13,10 +13,9 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.resttestclient.TestRestTemplate;
+import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
@@ -28,7 +27,7 @@ import {{package_name}}.rest.generated.model.ProblemDetail;
 
 @ExtendWith(MockitoExtension.class)
 @SpringBootTest(classes = {{domain_capitalized}}RestAdapterApplication.class, webEnvironment = RANDOM_PORT)
-@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class})
+@AutoConfigureTestRestTemplate
 public class {{domain_capitalized}}ResourceTest {
 
   private static final String LOCALHOST = "http://localhost:";