diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c50c13d..8c4d6edb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 3.0.0
+
+* Updated EclipseStore to v3.1.0
+
 # 2.6.0
 
 * Updated org.springframework.boot.version to v4.0.1
diff --git a/README.md b/README.md
index 32c4c798..7236c078 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,8 @@ instructions** are in the documentation](https://xdev-software.github.io/spring-
 | ``2.5.1-2.5.2``           | ``17+`` | ``3.4.2``   | ``2.1.1``    |
 | ``2.5.3``                 | ``17+`` | ``3.5.3``   | ``2.1.3``    |
 | ``2.5.4``                 | ``17+`` | ``3.5.9``   | ``2.1.3``    |
-| ``>= 2.6.0``              | ``17+`` | ``4.0.1``   | ``2.1.3``    |
+| ``2.6.0``                 | ``17+`` | ``4.0.1``   | ``2.1.3``    |
+| ``3.0.0``                 | ``17+`` | ``4.0.1``   | ``3.1.0``    |
 
 ## Demo
 
diff --git a/docs/antora.yml b/docs/antora.yml
index 1ff446ea..98d5dd84 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -1,14 +1,14 @@
 name: ROOT
 title: Spring-Data-Eclipse-Store
 version: master
-display_version: '2.6.0'
+display_version: '3.0.0'
 start_page: index.adoc
 nav:
   - modules/ROOT/nav.adoc
 asciidoc:
   attributes:
     product-name: 'Spring-Data-Eclipse-Store'
-    display-version: '2.6.0'
-    maven-version: '2.6.0'
+    display-version: '3.0.0'
+    maven-version: '3.0.0'
     page-editable: false
     page-out-of-support: false
diff --git a/pom.xml b/pom.xml
index 880c0414..94b0fa87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>spring-data-eclipse-store-root</artifactId>
-	<version>2.6.1-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<organization>
@@ -23,9 +23,10 @@
 
 		<!-- Should be in sync with org.eclipse.store:integrations-spring-boot3 -->
 		<org.springframework.boot.version>4.0.1</org.springframework.boot.version>
-		<org.eclipse.store.version>2.1.3</org.eclipse.store.version>
-		<org.eclipse.serializer.version>2.1.3</org.eclipse.serializer.version>
-		<org.eclipse.storage-restservice-springboot.version>2.1.3</org.eclipse.storage-restservice-springboot.version>
+		<org.eclipse.store.version>3.1.0</org.eclipse.store.version>
+		<org.eclipse.serializer.version>3.1.0</org.eclipse.serializer.version>
+		<org.eclipse.persistence.binary.jdk17.version>2.1.3</org.eclipse.persistence.binary.jdk17.version>
+		<org.eclipse.storage-restservice-springboot.version>3.1.0</org.eclipse.storage-restservice-springboot.version>
 	</properties>
 
 	<modules>
@@ -63,7 +64,7 @@
 			<dependency>
 				<groupId>org.eclipse.serializer</groupId>
 				<artifactId>persistence-binary-jdk17</artifactId>
-				<version>${org.eclipse.serializer.version}</version>
+				<version>${org.eclipse.persistence.binary.jdk17.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.store</groupId>
diff --git a/spring-data-eclipse-store-benchmark/pom.xml b/spring-data-eclipse-store-benchmark/pom.xml
index 535bbebe..d965cef5 100644
--- a/spring-data-eclipse-store-benchmark/pom.xml
+++ b/spring-data-eclipse-store-benchmark/pom.xml
@@ -5,11 +5,11 @@
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>spring-data-eclipse-store-root</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-data-eclipse-store-benchmark</artifactId>
-	<version>2.6.1-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<inceptionYear>2023</inceptionYear>
diff --git a/spring-data-eclipse-store-demo/pom.xml b/spring-data-eclipse-store-demo/pom.xml
index ba5d2497..48d93410 100644
--- a/spring-data-eclipse-store-demo/pom.xml
+++ b/spring-data-eclipse-store-demo/pom.xml
@@ -7,11 +7,11 @@
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>spring-data-eclipse-store-root</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-data-eclipse-store-demo</artifactId>
-	<version>2.6.1-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<organization>
diff --git a/spring-data-eclipse-store-jpa/pom.xml b/spring-data-eclipse-store-jpa/pom.xml
index af6b20b3..1880e8cf 100644
--- a/spring-data-eclipse-store-jpa/pom.xml
+++ b/spring-data-eclipse-store-jpa/pom.xml
@@ -7,11 +7,11 @@
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>spring-data-eclipse-store-root</artifactId>
-		<version>2.6.1-SNAPSHOT</version>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-data-eclipse-store-jpa</artifactId>
-	<version>2.6.1-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<inceptionYear>2023</inceptionYear>
diff --git a/spring-data-eclipse-store/pom.xml b/spring-data-eclipse-store/pom.xml
index eba335e7..d6cf95ea 100644
--- a/spring-data-eclipse-store/pom.xml
+++ b/spring-data-eclipse-store/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>spring-data-eclipse-store</artifactId>
-	<version>2.6.1-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-data-eclipse-store</name>
@@ -52,8 +52,9 @@
 
 		<!-- Should be in sync with org.eclipse.store:integrations-spring-boot3 -->
 		<org.springframework.boot.version>4.0.1</org.springframework.boot.version>
-		<org.eclipse.store.version>2.1.3</org.eclipse.store.version>
-		<org.eclipse.serializer.version>2.1.3</org.eclipse.serializer.version>
+		<org.eclipse.store.version>3.1.0</org.eclipse.store.version>
+		<org.eclipse.serializer.version>3.1.0</org.eclipse.serializer.version>
+		<org.eclipse.persistence.binary.jdk17.version>2.1.3</org.eclipse.persistence.binary.jdk17.version>
 		<hibernate-validator.version>9.0.1.Final</hibernate-validator.version>
 		<jakarta.el-api.version>6.0.1</jakarta.el-api.version>
 		<expressly.version>6.0.0-M1</expressly.version>
@@ -131,7 +132,7 @@
 		<dependency>
 			<groupId>org.eclipse.serializer</groupId>
 			<artifactId>persistence-binary-jdk17</artifactId>
-			<version>${org.eclipse.serializer.version}</version>
+			<version>${org.eclipse.persistence.binary.jdk17.version}</version>
 		</dependency>
 
 		<dependency>