diff --git a/pom.xml b/pom.xml
index f88d6ce79..29617674e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.7</version>
+        <version>4.0.0</version>
         <!-- spring-boot managed dependencies: https://docs.spring.io/spring-boot/appendix/dependency-versions/coordinates.html -->
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
@@ -104,7 +104,7 @@
         <!-- ////////////////// -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-webmvc</artifactId>
             <exclusions>
                 <exclusion>
                     <!-- excluded because we're using spring-boot-starter-log4j2 instead (see spring-boot logging docs) -->
@@ -129,6 +129,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-flyway</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-acl</artifactId>
@@ -139,7 +143,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
+            <artifactId>spring-boot-starter-aspectj</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -207,7 +211,7 @@
         </dependency>
         <dependency>
             <groupId>io.hypersistence</groupId>
-            <artifactId>hypersistence-utils-hibernate-63</artifactId>
+            <artifactId>hypersistence-utils-hibernate-71</artifactId>
             <version>${hypersistence.version}</version>
         </dependency>
 
@@ -222,18 +226,27 @@
         <!-- ////////////////// -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <artifactId>spring-boot-starter-aspectj-test</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.vaadin.external.google</groupId>
-                    <artifactId>android-json</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-test</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webmvc-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>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-flyway-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/org/fairdatapoint/entity/index/entry/IndexEntry.java b/src/main/java/org/fairdatapoint/entity/index/entry/IndexEntry.java
index 5fb4337ab..23f3c76a1 100644
--- a/src/main/java/org/fairdatapoint/entity/index/entry/IndexEntry.java
+++ b/src/main/java/org/fairdatapoint/entity/index/entry/IndexEntry.java
@@ -29,9 +29,9 @@
 import lombok.experimental.SuperBuilder;
 import org.fairdatapoint.entity.base.BaseEntity;
 import org.fairdatapoint.entity.index.event.IndexEvent;
-import org.hibernate.annotations.JdbcType;
+import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.annotations.Type;
-import org.hibernate.dialect.PostgreSQLEnumJdbcType;
+import org.hibernate.type.SqlTypes;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -60,13 +60,13 @@ public class IndexEntry extends BaseEntity {
 
     @NotNull
     @Enumerated(EnumType.STRING)
-    @JdbcType(PostgreSQLEnumJdbcType.class)
+    @JdbcTypeCode(SqlTypes.NAMED_ENUM)
     @Column(name = "state", columnDefinition = "INDEX_ENTRY_STATE", nullable = false)
     private IndexEntryState state = IndexEntryState.UNKNOWN;
 
     @NotNull
     @Enumerated(EnumType.STRING)
-    @JdbcType(PostgreSQLEnumJdbcType.class)
+    @JdbcTypeCode(SqlTypes.NAMED_ENUM)
     @Column(name = "permit", columnDefinition = "INDEX_ENTRY_PERMIT", nullable = false)
     private IndexEntryPermit permit = IndexEntryPermit.PENDING;
 
diff --git a/src/main/java/org/fairdatapoint/entity/index/event/IndexEvent.java b/src/main/java/org/fairdatapoint/entity/index/event/IndexEvent.java
index f06d1d289..270644424 100644
--- a/src/main/java/org/fairdatapoint/entity/index/event/IndexEvent.java
+++ b/src/main/java/org/fairdatapoint/entity/index/event/IndexEvent.java
@@ -33,9 +33,9 @@
 import org.fairdatapoint.entity.base.BaseEntity;
 import org.fairdatapoint.entity.index.entry.IndexEntry;
 import org.fairdatapoint.entity.index.event.payload.*;
-import org.hibernate.annotations.JdbcType;
+import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.annotations.Type;
-import org.hibernate.dialect.PostgreSQLEnumJdbcType;
+import org.hibernate.type.SqlTypes;
 
 import java.time.Instant;
 
@@ -50,7 +50,7 @@ public class IndexEvent extends BaseEntity {
 
     @NotNull
     @Enumerated(EnumType.STRING)
-    @JdbcType(PostgreSQLEnumJdbcType.class)
+    @JdbcTypeCode(SqlTypes.NAMED_ENUM)
     @Column(name = "type", columnDefinition = "INDEX_EVENT_TYPE", nullable = false)
     private IndexEventType type;
 
diff --git a/src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaVersion.java b/src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaVersion.java
index 6e463ca50..6f9146a87 100644
--- a/src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaVersion.java
+++ b/src/main/java/org/fairdatapoint/entity/schema/MetadataSchemaVersion.java
@@ -29,9 +29,9 @@
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 import org.fairdatapoint.entity.base.BaseEntityCustomUUID;
-import org.hibernate.annotations.JdbcType;
+import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.annotations.Type;
-import org.hibernate.dialect.PostgreSQLEnumJdbcType;
+import org.hibernate.type.SqlTypes;
 
 import java.util.HashSet;
 import java.util.List;
@@ -83,7 +83,7 @@ public class MetadataSchemaVersion extends BaseEntityCustomUUID {
 
     @NotNull
     @Enumerated(EnumType.STRING)
-    @JdbcType(PostgreSQLEnumJdbcType.class)
+    @JdbcTypeCode(SqlTypes.NAMED_ENUM)
     @Column(name = "type", columnDefinition = "METADATA_SCHEMA_TYPE", nullable = false)
     private MetadataSchemaType type;
 
@@ -95,7 +95,7 @@ public class MetadataSchemaVersion extends BaseEntityCustomUUID {
 
     @NotNull
     @Enumerated(EnumType.STRING)
-    @JdbcType(PostgreSQLEnumJdbcType.class)
+    @JdbcTypeCode(SqlTypes.NAMED_ENUM)
     @Column(name = "state", columnDefinition = "METADATA_SCHEMA_STATE", nullable = false)
     private MetadataSchemaState state;
 
diff --git a/src/main/java/org/fairdatapoint/entity/search/SearchSavedQuery.java b/src/main/java/org/fairdatapoint/entity/search/SearchSavedQuery.java
index c42596898..7b945406e 100644
--- a/src/main/java/org/fairdatapoint/entity/search/SearchSavedQuery.java
+++ b/src/main/java/org/fairdatapoint/entity/search/SearchSavedQuery.java
@@ -28,8 +28,8 @@
 import lombok.experimental.SuperBuilder;
 import org.fairdatapoint.entity.base.BaseEntity;
 import org.fairdatapoint.entity.user.UserAccount;
-import org.hibernate.annotations.JdbcType;
-import org.hibernate.dialect.PostgreSQLEnumJdbcType;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 @Entity(name = "SearchSavedQuery")
 @Table(name = "search_saved_query")
@@ -55,7 +55,7 @@ public class SearchSavedQuery extends BaseEntity {
 
     @NotNull
     @Enumerated(EnumType.STRING)
-    @JdbcType(PostgreSQLEnumJdbcType.class)
+    @JdbcTypeCode(SqlTypes.NAMED_ENUM)
     @Column(name = "type", columnDefinition = "SAVED_QUERY_TYPE", nullable = false)
     private SearchSavedQueryType type;
 
diff --git a/src/main/java/org/fairdatapoint/entity/settings/SettingsSearchFilter.java b/src/main/java/org/fairdatapoint/entity/settings/SettingsSearchFilter.java
index 9094542c2..ffcad094d 100644
--- a/src/main/java/org/fairdatapoint/entity/settings/SettingsSearchFilter.java
+++ b/src/main/java/org/fairdatapoint/entity/settings/SettingsSearchFilter.java
@@ -28,8 +28,8 @@
 import lombok.experimental.SuperBuilder;
 import org.fairdatapoint.entity.base.BaseEntity;
 import org.fairdatapoint.entity.search.SearchFilterType;
-import org.hibernate.annotations.JdbcType;
-import org.hibernate.dialect.PostgreSQLEnumJdbcType;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 import java.util.List;
 
@@ -44,7 +44,7 @@ public class SettingsSearchFilter extends BaseEntity {
 
     @NotNull
     @Enumerated(EnumType.STRING)
-    @JdbcType(PostgreSQLEnumJdbcType.class)
+    @JdbcTypeCode(SqlTypes.NAMED_ENUM)
     @Column(name = "type", columnDefinition = "SEARCH_FILTER_TYPE", nullable = false)
     private SearchFilterType type;
 
diff --git a/src/main/java/org/fairdatapoint/entity/user/UserAccount.java b/src/main/java/org/fairdatapoint/entity/user/UserAccount.java
index 76d569408..fe8ab0745 100644
--- a/src/main/java/org/fairdatapoint/entity/user/UserAccount.java
+++ b/src/main/java/org/fairdatapoint/entity/user/UserAccount.java
@@ -29,8 +29,8 @@
 import org.fairdatapoint.entity.apikey.ApiKey;
 import org.fairdatapoint.entity.base.BaseEntity;
 import org.fairdatapoint.entity.search.SearchSavedQuery;
-import org.hibernate.annotations.JdbcType;
-import org.hibernate.dialect.PostgreSQLEnumJdbcType;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 import java.util.List;
 import java.util.UUID;
@@ -62,7 +62,7 @@ public class UserAccount extends BaseEntity {
 
     @NotNull
     @Enumerated(EnumType.STRING)
-    @JdbcType(PostgreSQLEnumJdbcType.class)
+    @JdbcTypeCode(SqlTypes.NAMED_ENUM)
     @Column(name = "user_role", columnDefinition = "USER_ROLE", nullable = false)
     private UserRole role;