diff --git a/README.md b/README.md
index 094f34e..e73aa93 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,11 @@ cross-institution registrations.
 - Java 8
 - Maven 3
 
+Set the JAVA_HOME property for maven (example for macOS):
+```
+export JAVA_HOME=/Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home/
+```
+
 ## [Building and running](#building-and-running)
 
 ### [The student-mobility-inteken-ontvanger-generiek-server](#student-mobility-inteken-ontvanger-generiek-server)
diff --git a/pom.xml b/pom.xml
index 199eeb4..8041964 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,11 +38,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <!-- Upgrade to version 2 will break the current migrations. You can't change them as Flyway will complain. -->
+        <!-- Upgrade to version 2 will require the removal of the current data. -->
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.200</version>
+            <version>2.2.224</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/src/main/resources/db/h2/migration/V0__initial.sql b/src/main/resources/db/h2/migration/V0__initial.sql
index e6c3b94..4e79904 100644
--- a/src/main/resources/db/h2/migration/V0__initial.sql
+++ b/src/main/resources/db/h2/migration/V0__initial.sql
@@ -1,7 +1,7 @@
 CREATE TABLE enrollment_requests
 (
-    id            BIGINT(20)   NOT NULL AUTO_INCREMENT,
-    identifier    VARCHAR(254) NOT NULL,
+    id            BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    identifier    VARCHAR(255) NOT NULL,
     person_uri    VARCHAR(255) NOT NULL,
     results_uri   VARCHAR(255) NOT NULL,
     person_id     VARCHAR(255),
diff --git a/src/main/resources/db/h2/migration/V4__add_associations.sql b/src/main/resources/db/h2/migration/V4__add_associations.sql
index 70525db..8ad6e75 100644
--- a/src/main/resources/db/h2/migration/V4__add_associations.sql
+++ b/src/main/resources/db/h2/migration/V4__add_associations.sql
@@ -1,8 +1,8 @@
 CREATE TABLE associations
 (
-    id                      BIGINT(20)   NOT NULL AUTO_INCREMENT,
-    association_id          VARCHAR(254) NOT NULL,
-    enrollment_request_id   BIGINT(20)   NOT NULL,
+    id            BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+    association_id          VARCHAR(255) NOT NULL,
+    enrollment_request_id   BIGINT   NOT NULL,
     created                 TIMESTAMP    NOT NULL DEFAULT CURRENT_TIMESTAMP,
     CONSTRAINT fk_enrollment_request_id FOREIGN KEY (enrollment_request_id) REFERENCES enrollment_requests(id) ON DELETE CASCADE
 );