diff --git a/README.md b/README.md
index 15aa9ca..689248d 100644
--- a/README.md
+++ b/README.md
@@ -193,7 +193,7 @@ If you’re a Maven user, you can use the dependencies by adding the following t
         <dependency>
             <groupId>org.springframework.grpc</groupId>
             <artifactId>spring-grpc-dependencies</artifactId>
-            <version>0.4.0</version>
+            <version>0.5.0-SNAPSHOT</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>
@@ -207,7 +207,7 @@ As shown in the snippet below this can then be followed by version-less declarat
 
 ```gradle
 dependencies {
-  implementation platform("org.springframework.grpc:spring-grpc-dependencies:0.4.0")
+  implementation platform("org.springframework.grpc:spring-grpc-dependencies:0.5.0-SNAPSHOT")
 }
 ```
 
diff --git a/pom.xml b/pom.xml
index e1812b6..5aea227 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.grpc</groupId>
 	<artifactId>spring-grpc</artifactId>
-	<version>0.4.0</version>
+	<version>0.5.0-SNAPSHOT</version>
 
 	<packaging>pom</packaging>
 	<url>https://github.com/spring-projects-experimental/spring-grpc</url>
diff --git a/samples/grpc-oauth2/build.gradle b/samples/grpc-oauth2/build.gradle
index 819cfb8..c6e9798 100644
--- a/samples/grpc-oauth2/build.gradle
+++ b/samples/grpc-oauth2/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = 'com.example'
-version = '0.4.0'
+version = '0.5.0-SNAPSHOT'
 
 java {
 	toolchain {
@@ -24,7 +24,7 @@ repositories {
 
 dependencyManagement {
 	imports {
-		mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.4.0'
+		mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.5.0-SNAPSHOT'
 	}
 }
 
diff --git a/samples/grpc-oauth2/pom.xml b/samples/grpc-oauth2/pom.xml
index 2fc9c19..504908b 100644
--- a/samples/grpc-oauth2/pom.xml
+++ b/samples/grpc-oauth2/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>org.springframework.grpc</groupId>
 	<artifactId>grpc-oauth2-sample</artifactId>
-	<version>0.4.0</version>
+	<version>0.5.0-SNAPSHOT</version>
 	<name>Spring gRPC Server Sample</name>
 	<description>Demo project for Spring gRPC</description>
 	<url />
@@ -40,7 +40,7 @@
 			<dependency>
 				<groupId>org.springframework.grpc</groupId>
 				<artifactId>spring-grpc-dependencies</artifactId>
-				<version>0.4.0</version>
+				<version>0.5.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/samples/grpc-reactive/build.gradle b/samples/grpc-reactive/build.gradle
index 87ee6c7..f0ffec0 100644
--- a/samples/grpc-reactive/build.gradle
+++ b/samples/grpc-reactive/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = 'com.example'
-version = '0.4.0'
+version = '0.5.0-SNAPSHOT'
 
 java {
     toolchain {
@@ -24,7 +24,7 @@ repositories {
 
 dependencyManagement {
     imports {
-        mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.4.0'
+        mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.5.0-SNAPSHOT'
     }
 }
 
diff --git a/samples/grpc-reactive/pom.xml b/samples/grpc-reactive/pom.xml
index 684d601..4a73747 100644
--- a/samples/grpc-reactive/pom.xml
+++ b/samples/grpc-reactive/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>org.springframework.grpc</groupId>
 	<artifactId>grpc-reactive-sample</artifactId>
-	<version>0.4.0</version>
+	<version>0.5.0-SNAPSHOT</version>
 	<name>Spring gRPC Reactive Sample</name>
 	<description>Demo project for Spring gRPC</description>
 	<url />
@@ -38,7 +38,7 @@
 			<dependency>
 				<groupId>org.springframework.grpc</groupId>
 				<artifactId>spring-grpc-dependencies</artifactId>
-				<version>0.4.0</version>
+				<version>0.5.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/samples/grpc-secure/build.gradle b/samples/grpc-secure/build.gradle
index 819cfb8..c6e9798 100644
--- a/samples/grpc-secure/build.gradle
+++ b/samples/grpc-secure/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = 'com.example'
-version = '0.4.0'
+version = '0.5.0-SNAPSHOT'
 
 java {
 	toolchain {
@@ -24,7 +24,7 @@ repositories {
 
 dependencyManagement {
 	imports {
-		mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.4.0'
+		mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.5.0-SNAPSHOT'
 	}
 }
 
diff --git a/samples/grpc-secure/pom.xml b/samples/grpc-secure/pom.xml
index 6549140..526e549 100644
--- a/samples/grpc-secure/pom.xml
+++ b/samples/grpc-secure/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>org.springframework.grpc</groupId>
 	<artifactId>grpc-secure-sample</artifactId>
-	<version>0.4.0</version>
+	<version>0.5.0-SNAPSHOT</version>
 	<name>Spring gRPC Server Sample</name>
 	<description>Demo project for Spring gRPC</description>
 	<url />
@@ -38,7 +38,7 @@
 			<dependency>
 				<groupId>org.springframework.grpc</groupId>
 				<artifactId>spring-grpc-dependencies</artifactId>
-				<version>0.4.0</version>
+				<version>0.5.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/samples/grpc-server-netty-shaded/build.gradle b/samples/grpc-server-netty-shaded/build.gradle
index 6bce5d8..d346b21 100644
--- a/samples/grpc-server-netty-shaded/build.gradle
+++ b/samples/grpc-server-netty-shaded/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = 'com.example'
-version = '0.4.0'
+version = '0.5.0-SNAPSHOT'
 
 java {
     toolchain {
@@ -24,7 +24,7 @@ repositories {
 
 dependencyManagement {
     imports {
-        mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.4.0'
+        mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.5.0-SNAPSHOT'
     }
 }
 
diff --git a/samples/grpc-server-netty-shaded/pom.xml b/samples/grpc-server-netty-shaded/pom.xml
index 2e36731..cd426aa 100644
--- a/samples/grpc-server-netty-shaded/pom.xml
+++ b/samples/grpc-server-netty-shaded/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>com.example</groupId>
 	<artifactId>grpc-server-netty-shaded</artifactId>
-	<version>0.4.0</version>
+	<version>0.5.0-SNAPSHOT</version>
 	<name>Spring gRPC Server Sample Netty Shaded</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
@@ -25,7 +25,7 @@
 			<dependency>
 				<groupId>org.springframework.grpc</groupId>
 				<artifactId>spring-grpc-dependencies</artifactId>
-				<version>0.4.0</version>
+				<version>0.5.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/samples/grpc-server/build.gradle b/samples/grpc-server/build.gradle
index 2dee856..f5d2935 100644
--- a/samples/grpc-server/build.gradle
+++ b/samples/grpc-server/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = 'com.example'
-version = '0.4.0'
+version = '0.5.0-SNAPSHOT'
 
 java {
     toolchain {
@@ -24,7 +24,7 @@ repositories {
 
 dependencyManagement {
     imports {
-        mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.4.0'
+        mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.5.0-SNAPSHOT'
     }
 }
 
diff --git a/samples/grpc-server/pom.xml b/samples/grpc-server/pom.xml
index 3853bc4..00314ed 100644
--- a/samples/grpc-server/pom.xml
+++ b/samples/grpc-server/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>org.springframework.grpc</groupId>
 	<artifactId>grpc-server-sample</artifactId>
-	<version>0.4.0</version>
+	<version>0.5.0-SNAPSHOT</version>
 	<name>Spring gRPC Server Sample</name>
 	<description>Demo project for Spring gRPC</description>
 	<url />
@@ -38,7 +38,7 @@
 			<dependency>
 				<groupId>org.springframework.grpc</groupId>
 				<artifactId>spring-grpc-dependencies</artifactId>
-				<version>0.4.0</version>
+				<version>0.5.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/samples/grpc-tomcat-secure/pom.xml b/samples/grpc-tomcat-secure/pom.xml
index d492f5d..5404262 100644
--- a/samples/grpc-tomcat-secure/pom.xml
+++ b/samples/grpc-tomcat-secure/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>org.springframework.grpc</groupId>
 	<artifactId>grpc-tomcat-secure-sample</artifactId>
-	<version>0.4.0</version>
+	<version>0.5.0-SNAPSHOT</version>
 	<name>Spring gRPC Server Sample</name>
 	<description>Demo project for Spring gRPC</description>
 	<url />
@@ -38,7 +38,7 @@
 			<dependency>
 				<groupId>org.springframework.grpc</groupId>
 				<artifactId>spring-grpc-dependencies</artifactId>
-				<version>0.4.0</version>
+				<version>0.5.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/samples/grpc-tomcat/pom.xml b/samples/grpc-tomcat/pom.xml
index c4d9ae9..7f849a9 100644
--- a/samples/grpc-tomcat/pom.xml
+++ b/samples/grpc-tomcat/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>org.springframework.grpc</groupId>
 	<artifactId>grpc-tomcat-sample</artifactId>
-	<version>0.4.0</version>
+	<version>0.5.0-SNAPSHOT</version>
 	<name>Spring gRPC Server Sample</name>
 	<description>Demo project for Spring gRPC</description>
 	<url />
@@ -38,7 +38,7 @@
 			<dependency>
 				<groupId>org.springframework.grpc</groupId>
 				<artifactId>spring-grpc-dependencies</artifactId>
-				<version>0.4.0</version>
+				<version>0.5.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/samples/grpc-webflux/build.gradle b/samples/grpc-webflux/build.gradle
index d5c97fa..67e8f53 100644
--- a/samples/grpc-webflux/build.gradle
+++ b/samples/grpc-webflux/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = 'com.example'
-version = '0.4.0'
+version = '0.5.0-SNAPSHOT'
 
 java {
     toolchain {
@@ -24,7 +24,7 @@ repositories {
 
 dependencyManagement {
     imports {
-        mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.4.0'
+        mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.5.0-SNAPSHOT'
     }
 }
 
diff --git a/samples/grpc-webflux/pom.xml b/samples/grpc-webflux/pom.xml
index b0469fb..babbb42 100644
--- a/samples/grpc-webflux/pom.xml
+++ b/samples/grpc-webflux/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>org.springframework.grpc</groupId>
 	<artifactId>grpc-webflux-sample</artifactId>
-	<version>0.4.0</version>
+	<version>0.5.0-SNAPSHOT</version>
 	<name>Spring gRPC Server Sample</name>
 	<description>Demo project for Spring gRPC</description>
 	<url />
@@ -38,7 +38,7 @@
 			<dependency>
 				<groupId>org.springframework.grpc</groupId>
 				<artifactId>spring-grpc-dependencies</artifactId>
-				<version>0.4.0</version>
+				<version>0.5.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/samples/pom.xml b/samples/pom.xml
index 6d7d044..51c2d05 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.springframework.grpc</groupId>
 		<artifactId>spring-grpc</artifactId>
-		<version>0.4.0</version>
+		<version>0.5.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.springframework.grpc</groupId>
 	<artifactId>parent-samples</artifactId>
-	<version>0.4.0</version>
+	<version>0.5.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Parent Demo</name>
 
diff --git a/spring-grpc-client-spring-boot-starter/pom.xml b/spring-grpc-client-spring-boot-starter/pom.xml
index e41a8dd..56312e3 100644
--- a/spring-grpc-client-spring-boot-starter/pom.xml
+++ b/spring-grpc-client-spring-boot-starter/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.grpc</groupId>
 		<artifactId>spring-grpc</artifactId>
-		<version>0.4.0</version>
+		<version>0.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-grpc-client-spring-boot-starter</artifactId>
 	<packaging>jar</packaging>
diff --git a/spring-grpc-core/pom.xml b/spring-grpc-core/pom.xml
index ac1cc12..6d42ad5 100644
--- a/spring-grpc-core/pom.xml
+++ b/spring-grpc-core/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.grpc</groupId>
 		<artifactId>spring-grpc</artifactId>
-		<version>0.4.0</version>
+		<version>0.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-grpc-core</artifactId>
 	<packaging>jar</packaging>
diff --git a/spring-grpc-dependencies/pom.xml b/spring-grpc-dependencies/pom.xml
index a037569..a826dd2 100644
--- a/spring-grpc-dependencies/pom.xml
+++ b/spring-grpc-dependencies/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>org.springframework.grpc</groupId>
 	<artifactId>spring-grpc-dependencies</artifactId>
-	<version>0.4.0</version>
+	<version>0.5.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring gRPC dependencies</name>
diff --git a/spring-grpc-docs/pom.xml b/spring-grpc-docs/pom.xml
index 70c2736..c9c487e 100644
--- a/spring-grpc-docs/pom.xml
+++ b/spring-grpc-docs/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.grpc</groupId>
 		<artifactId>spring-grpc</artifactId>
-		<version>0.4.0</version>
+		<version>0.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-grpc-docs</artifactId>
 	<name>Spring gRPC Docs</name>
diff --git a/spring-grpc-docs/src/main/antora/modules/ROOT/pages/getting-started.adoc b/spring-grpc-docs/src/main/antora/modules/ROOT/pages/getting-started.adoc
index 92ad016..94452b6 100644
--- a/spring-grpc-docs/src/main/antora/modules/ROOT/pages/getting-started.adoc
+++ b/spring-grpc-docs/src/main/antora/modules/ROOT/pages/getting-started.adoc
@@ -199,7 +199,7 @@ If you’re a Maven user, you can use the dependencies by adding the following t
         <dependency>
             <groupId>org.springframework.grpc</groupId>
             <artifactId>spring-grpc-dependencies</artifactId>
-            <version>0.4.0</version>
+            <version>0.5.0-SNAPSHOT</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>
@@ -214,7 +214,7 @@ As shown in the snippet below this can then be followed by version-less declarat
 [source,gradle]
 ----
 dependencies {
-  implementation platform("org.springframework.grpc:spring-grpc-dependencies:0.4.0")
+  implementation platform("org.springframework.grpc:spring-grpc-dependencies:0.5.0-SNAPSHOT")
 }
 ----
 
diff --git a/spring-grpc-docs/src/main/antora/modules/ROOT/pages/whats-new.adoc b/spring-grpc-docs/src/main/antora/modules/ROOT/pages/whats-new.adoc
index ff49dba..32fe5ac 100644
--- a/spring-grpc-docs/src/main/antora/modules/ROOT/pages/whats-new.adoc
+++ b/spring-grpc-docs/src/main/antora/modules/ROOT/pages/whats-new.adoc
@@ -3,9 +3,9 @@
 :page-section-summary-toc: 1
 
 [[what-s-new-in-0-4-0-since-0-3-0]]
-== What's New in 0.4.0 Since 0.3.0
+== What's New in 0.5.0-SNAPSHOT Since 0.3.0
 
-This section covers the changes made from version 0.3.0 to version 0.4.0.
+This section covers the changes made from version 0.3.0 to version 0.5.0-SNAPSHOT.
 
 === Fine-grained starter modules
 The following fine-grained Spring Boot starter modules have been added:
diff --git a/spring-grpc-server-spring-boot-starter/pom.xml b/spring-grpc-server-spring-boot-starter/pom.xml
index 0b47e8b..95ea78f 100644
--- a/spring-grpc-server-spring-boot-starter/pom.xml
+++ b/spring-grpc-server-spring-boot-starter/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.grpc</groupId>
 		<artifactId>spring-grpc</artifactId>
-		<version>0.4.0</version>
+		<version>0.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-grpc-server-spring-boot-starter</artifactId>
 	<packaging>jar</packaging>
diff --git a/spring-grpc-server-web-spring-boot-starter/pom.xml b/spring-grpc-server-web-spring-boot-starter/pom.xml
index b0c8ee2..2de18df 100644
--- a/spring-grpc-server-web-spring-boot-starter/pom.xml
+++ b/spring-grpc-server-web-spring-boot-starter/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.grpc</groupId>
 		<artifactId>spring-grpc</artifactId>
-		<version>0.4.0</version>
+		<version>0.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-grpc-server-web-spring-boot-starter</artifactId>
 	<packaging>jar</packaging>
diff --git a/spring-grpc-spring-boot-autoconfigure/pom.xml b/spring-grpc-spring-boot-autoconfigure/pom.xml
index 6b2a3cf..cce4323 100644
--- a/spring-grpc-spring-boot-autoconfigure/pom.xml
+++ b/spring-grpc-spring-boot-autoconfigure/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.grpc</groupId>
 		<artifactId>spring-grpc</artifactId>
-		<version>0.4.0</version>
+		<version>0.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-grpc-spring-boot-autoconfigure</artifactId>
 	<packaging>jar</packaging>
diff --git a/spring-grpc-spring-boot-starter/pom.xml b/spring-grpc-spring-boot-starter/pom.xml
index 7a1c10c..e96b88c 100644
--- a/spring-grpc-spring-boot-starter/pom.xml
+++ b/spring-grpc-spring-boot-starter/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.grpc</groupId>
 		<artifactId>spring-grpc</artifactId>
-		<version>0.4.0</version>
+		<version>0.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-grpc-spring-boot-starter</artifactId>
 	<packaging>jar</packaging>
diff --git a/spring-grpc-test/pom.xml b/spring-grpc-test/pom.xml
index 0f0adec..2c183a2 100644
--- a/spring-grpc-test/pom.xml
+++ b/spring-grpc-test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.grpc</groupId>
 		<artifactId>spring-grpc</artifactId>
-		<version>0.4.0</version>
+		<version>0.5.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-grpc-test</artifactId>
 	<name>Spring gRPC Test</name>