diff --git a/.github/actions/setup-jdk/action.yaml b/.github/actions/setup-jdk/action.yaml
index d95bd3bd..b50539f0 100644
--- a/.github/actions/setup-jdk/action.yaml
+++ b/.github/actions/setup-jdk/action.yaml
@@ -1,10 +1,10 @@
 name: "Setups JDK"
-description: "Setups JDK 17"
+description: "Setups JDK 21"
 runs:
   using: "composite"
   steps:
     - name: Setup Java JDK
       uses: actions/setup-java@v4
       with:
-        java-version: 17
+        java-version: 21
         distribution: adopt
diff --git a/pom.xml b/pom.xml
index 71758fbf..4720f08f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
 	<properties>
-		<neo4j.version>5.26.5</neo4j.version>
-		<java.version>17</java.version>
+		<neo4j.version>2025.06.0</neo4j.version>
+		<java.version>21</java.version>
 		<geotools.version>32.2</geotools.version>
 		<spatial.test.osm.version>20100819</spatial.test.osm.version>
 		<spatial.test.shp.version>20100819</spatial.test.shp.version>
@@ -16,7 +16,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>neo4j-spatial</artifactId>
 	<groupId>org.neo4j</groupId>
-	<version>5.26.1-SNAPSHOT</version>
+	<version>2025.06-SNAPSHOT</version>
 	<name>Neo4j - Spatial Components</name>
 	<description>Spatial utilities and components for Neo4j</description>
 	<url>https://neo4j.com/labs/neo4j-spatial/5/</url>
diff --git a/server-plugin/pom.xml b/server-plugin/pom.xml
index 14c98b8b..f28663f2 100644
--- a/server-plugin/pom.xml
+++ b/server-plugin/pom.xml
@@ -26,11 +26,27 @@
 	<parent>
 		<groupId>org.neo4j</groupId>
 		<artifactId>neo4j-spatial</artifactId>
-		<version>5.26.1-SNAPSHOT</version>
+		<version>2025.06-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>neo4j-spatial-server-plugin</artifactId>
 
+	<properties>
+		<maven.compiler.release>21</maven.compiler.release>
+	</properties>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.junit</groupId>
+				<artifactId>junit-bom</artifactId>
+				<version>5.10.3</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -113,10 +129,14 @@
 		</dependency>
 
 		<!-- The JUnit-Hamcrest-Mockito combo -->
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>5.11.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/server-plugin/src/main/java/org/neo4j/gis/spatial/index/IndexManager.java b/server-plugin/src/main/java/org/neo4j/gis/spatial/index/IndexManager.java
index 2a379347..2b22939a 100644
--- a/server-plugin/src/main/java/org/neo4j/gis/spatial/index/IndexManager.java
+++ b/server-plugin/src/main/java/org/neo4j/gis/spatial/index/IndexManager.java
@@ -32,6 +32,8 @@
 import org.neo4j.kernel.impl.api.security.RestrictedAccessMode;
 import org.neo4j.kernel.internal.GraphDatabaseAPI;
 
+import static org.neo4j.internal.kernel.api.security.StaticAccessMode.SCHEMA;
+
 public class IndexManager {
 
 	private final GraphDatabaseAPI db;
@@ -44,7 +46,7 @@ public static SecurityContext withIndexCreate(SecurityContext securityContext) {
 		}
 
 		private IndexAccessMode(SecurityContext securityContext) {
-			super(securityContext.mode(), Static.SCHEMA);
+			super(securityContext.mode(), SCHEMA);
 		}
 
 		@Override