diff --git a/helloworld/pom.xml b/helloworld/pom.xml
index df0a5bc..feac138 100644
--- a/helloworld/pom.xml
+++ b/helloworld/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.samples.spring</groupId>
 	<artifactId>spring-rabbit-helloworld</artifactId>
-	<version>2.2.8.RELEASE</version>
+	<version>2.3.0-M1</version>
 	<packaging>jar</packaging>
 	<name>Spring AMQP Hello World</name>
 	<url>https://www.spring.io</url>
@@ -16,7 +16,7 @@
 	</description>
 	<properties>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
-		<spring.amqp.version>2.2.8.RELEASE</spring.amqp.version>
+		<spring.amqp.version>2.3.0-M1</spring.amqp.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<maven.test.failure.ignore>false</maven.test.failure.ignore>
diff --git a/log4j2/pom.xml b/log4j2/pom.xml
index 9ef87b4..bde5ab7 100644
--- a/log4j2/pom.xml
+++ b/log4j2/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.amqp.samples</groupId>
 	<artifactId>log4j2</artifactId>
-	<version>2.2.8.RELEASE</version>
+	<version>2.3.0-M1</version>
 	<packaging>jar</packaging>
 
 	<name>log4j2</name>
@@ -14,15 +14,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.8.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring.framework.version>5.2.6.RELEASE</spring.framework.version>
-		<spring.amqp.version>2.2.8.RELEASE</spring.amqp.version>
+		<spring.framework.version>5.3.0-M1</spring.framework.version>
+		<spring.amqp.version>2.3.0-M1</spring.amqp.version>
 	</properties>
 
 	<dependencies>
diff --git a/pom.xml b/pom.xml
index 120261f..7c0a47b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>org.springframework.amqp</groupId>
 	<artifactId>spring-amqp-samples</artifactId>
 	<name>Spring AMQP Samples</name>
-	<version>2.2.5.RELEASE</version>
+	<version>2.3.0-M1</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>helloworld</module>
diff --git a/spring-rabbit-confirms-returns/pom.xml b/spring-rabbit-confirms-returns/pom.xml
index 25f7aae..a6835b5 100644
--- a/spring-rabbit-confirms-returns/pom.xml
+++ b/spring-rabbit-confirms-returns/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.amqp.samples</groupId>
 	<artifactId>spring-rabbit-confirms-returns</artifactId>
-	<version>2.2.8.RELEASE</version>
+	<version>2.3.0-M1</version>
 	<packaging>jar</packaging>
 
 	<name>spring-rabbit-confirms-returns</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.8.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring.amqp.version>2.2.8.RELEASE</spring.amqp.version>
+		<spring.amqp.version>2.3.0-M1</spring.amqp.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-rabbit-confirms-returns/src/main/resources/application.properties b/spring-rabbit-confirms-returns/src/main/resources/application.properties
index 1ecbe3b..d1ccb54 100644
--- a/spring-rabbit-confirms-returns/src/main/resources/application.properties
+++ b/spring-rabbit-confirms-returns/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-spring.rabbitmq.publisher-confirms=true
+spring.rabbitmq.publisher-confirm-type=correlated
 spring.rabbitmq.publisher-returns=true
 
 spring.rabbitmq.template.mandatory=true
diff --git a/spring-rabbit-global-errorhandler/pom.xml b/spring-rabbit-global-errorhandler/pom.xml
index f942696..d8c5aeb 100644
--- a/spring-rabbit-global-errorhandler/pom.xml
+++ b/spring-rabbit-global-errorhandler/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.example</groupId>
 	<artifactId>spring-rabbit-global-errorhandler</artifactId>
-	<version>2.2.8.RELEASE</version>
+	<version>2.3.0-M1</version>
 	<packaging>jar</packaging>
 
 	<name>spring-rabbit-global-errorhandler</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.8.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring.amqp.version>2.2.8.RELEASE</spring.amqp.version>
+		<spring.amqp.version>2.3.0-M1</spring.amqp.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-rabbit-json/pom.xml b/spring-rabbit-json/pom.xml
index 95467dd..63f2691 100644
--- a/spring-rabbit-json/pom.xml
+++ b/spring-rabbit-json/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.example</groupId>
 	<artifactId>spring-rabbit-json</artifactId>
-	<version>2.2.8.RELEASE</version>
+	<version>2.3.0-M1</version>
 	<packaging>jar</packaging>
 
 	<name>spring-rabbit-json</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.8.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring.amqp.version>2.2.8.RELEASE</spring.amqp.version>
+		<spring.amqp.version>2.3.0-M1</spring.amqp.version>
 	</properties>
 
 	<dependencies>
diff --git a/stocks/pom.xml b/stocks/pom.xml
index 33dea53..664804b 100644
--- a/stocks/pom.xml
+++ b/stocks/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.samples.spring</groupId>
 	<artifactId>spring-rabbit-stocks</artifactId>
-	<version>2.2.8.RELEASE</version>
+	<version>2.3.0-M1</version>
 	<packaging>war</packaging>
 	<name>Spring Rabbit Stocks</name>
 	<url>https://www.spring.io</url>
@@ -15,8 +15,8 @@
 	</description>
 	<properties>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
-		<spring.framework.version>5.2.6.RELEASE</spring.framework.version>
-		<spring.amqp.version>2.2.8.RELEASE</spring.amqp.version>
+		<spring.framework.version>5.3.0-M1</spring.framework.version>
+		<spring.amqp.version>2.3.0-M1</spring.amqp.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<maven.test.failure.ignore>false</maven.test.failure.ignore>