diff --git a/.flattened-pom.xml b/.flattened-pom.xml
index a1bbbc8..4deb47a 100644
--- a/.flattened-pom.xml
+++ b/.flattened-pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-build</artifactId>
-    <version>2.2.0.RELEASE</version>
+    <version>2.2.1.BUILD-SNAPSHOT</version>
     <relativePath></relativePath>
   </parent>
   <groupId>org.springframework.cloud</groupId>
   <artifactId>spring-cloud-cloudfoundry</artifactId>
-  <version>2.2.0.BUILD-SNAPSHOT</version>
+  <version>2.2.1.BUILD-SNAPSHOT</version>
   <packaging>pom</packaging>
   <description>Spring Cloud parent pom, managing plugins and dependencies for Spring
 		Cloud projects</description>
diff --git a/docs/.flattened-pom.xml b/docs/.flattened-pom.xml
index 1f14ada..6e85258 100644
--- a/docs/.flattened-pom.xml
+++ b/docs/.flattened-pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-cloudfoundry</artifactId>
-    <version>2.2.0.BUILD-SNAPSHOT</version>
+    <version>2.2.1.BUILD-SNAPSHOT</version>
   </parent>
   <groupId>org.springframework.cloud</groupId>
   <artifactId>spring-cloud-cloudfoundry-docs</artifactId>
-  <version>2.2.0.BUILD-SNAPSHOT</version>
+  <version>2.2.1.BUILD-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Spring Cloud for Cloud Foundry Docs</name>
   <description>Spring Cloud Docs</description>
@@ -100,25 +100,25 @@
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-starter-cloudfoundry</artifactId>
-      <version>2.2.0.BUILD-SNAPSHOT</version>
+      <version>2.2.1.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-cloudfoundry-commons</artifactId>
-      <version>2.2.0.BUILD-SNAPSHOT</version>
+      <version>2.2.1.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-cloudfoundry-web</artifactId>
-      <version>2.2.0.BUILD-SNAPSHOT</version>
+      <version>2.2.1.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-cloudfoundry-discovery</artifactId>
-      <version>2.2.0.BUILD-SNAPSHOT</version>
+      <version>2.2.1.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/pom.xml b/pom.xml
index cbe3217..0c38315 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.0.RELEASE</version>
+		<version>2.2.1.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
diff --git a/spring-cloud-cloudfoundry-commons/.flattened-pom.xml b/spring-cloud-cloudfoundry-commons/.flattened-pom.xml
index c3947d9..2601c23 100644
--- a/spring-cloud-cloudfoundry-commons/.flattened-pom.xml
+++ b/spring-cloud-cloudfoundry-commons/.flattened-pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-cloudfoundry</artifactId>
-    <version>2.2.0.BUILD-SNAPSHOT</version>
+    <version>2.2.1.BUILD-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.springframework.cloud</groupId>
   <artifactId>spring-cloud-cloudfoundry-commons</artifactId>
-  <version>2.2.0.BUILD-SNAPSHOT</version>
+  <version>2.2.1.BUILD-SNAPSHOT</version>
   <description>Spring Cloud CloudFoundry Commons</description>
   <url>https://spring.io/spring-cloud/spring-cloud-cloudfoundry/spring-cloud-cloudfoundry-commons</url>
   <organization>
diff --git a/spring-cloud-cloudfoundry-discovery/.flattened-pom.xml b/spring-cloud-cloudfoundry-discovery/.flattened-pom.xml
index 2095a0e..644222c 100644
--- a/spring-cloud-cloudfoundry-discovery/.flattened-pom.xml
+++ b/spring-cloud-cloudfoundry-discovery/.flattened-pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-cloudfoundry</artifactId>
-    <version>2.2.0.BUILD-SNAPSHOT</version>
+    <version>2.2.1.BUILD-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.springframework.cloud</groupId>
   <artifactId>spring-cloud-cloudfoundry-discovery</artifactId>
-  <version>2.2.0.BUILD-SNAPSHOT</version>
+  <version>2.2.1.BUILD-SNAPSHOT</version>
   <description>Spring Cloud CloudFoundry Discovery</description>
   <url>https://spring.io/spring-cloud/spring-cloud-cloudfoundry/spring-cloud-cloudfoundry-discovery</url>
   <organization>
@@ -99,7 +99,7 @@
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-cloudfoundry-commons</artifactId>
-      <version>2.2.0.BUILD-SNAPSHOT</version>
+      <version>2.2.1.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -126,26 +126,26 @@
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-context</artifactId>
-      <version>2.2.0.BUILD-SNAPSHOT</version>
+      <version>2.2.1.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-commons</artifactId>
-      <version>2.2.0.BUILD-SNAPSHOT</version>
+      <version>2.2.1.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-netflix-hystrix</artifactId>
-      <version>2.2.0.BUILD-SNAPSHOT</version>
+      <version>2.2.1.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
-      <version>2.2.0.BUILD-SNAPSHOT</version>
+      <version>2.2.1.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
diff --git a/spring-cloud-cloudfoundry-sample/.flattened-pom.xml b/spring-cloud-cloudfoundry-sample/.flattened-pom.xml
index ac7ea86..ee5223d 100644
--- a/spring-cloud-cloudfoundry-sample/.flattened-pom.xml
+++ b/spring-cloud-cloudfoundry-sample/.flattened-pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-cloudfoundry</artifactId>
-    <version>2.2.0.BUILD-SNAPSHOT</version>
+    <version>2.2.1.BUILD-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.springframework.cloud</groupId>
   <artifactId>spring-cloud-cloudfoundry-sample</artifactId>
-  <version>2.2.0.BUILD-SNAPSHOT</version>
+  <version>2.2.1.BUILD-SNAPSHOT</version>
   <description>Spring Cloud parent pom, managing plugins and dependencies for Spring
 		Cloud projects</description>
   <url>https://spring.io/spring-cloud/spring-cloud-cloudfoundry/spring-cloud-cloudfoundry-sample</url>
@@ -106,13 +106,13 @@
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-commons</artifactId>
-      <version>2.2.0.BUILD-SNAPSHOT</version>
+      <version>2.2.1.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-cloudfoundry-discovery</artifactId>
-      <version>2.2.0.BUILD-SNAPSHOT</version>
+      <version>2.2.1.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/spring-cloud-cloudfoundry-web/.flattened-pom.xml b/spring-cloud-cloudfoundry-web/.flattened-pom.xml
index 4e29641..23147a3 100644
--- a/spring-cloud-cloudfoundry-web/.flattened-pom.xml
+++ b/spring-cloud-cloudfoundry-web/.flattened-pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-cloudfoundry</artifactId>
-    <version>2.2.0.BUILD-SNAPSHOT</version>
+    <version>2.2.1.BUILD-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.springframework.cloud</groupId>
   <artifactId>spring-cloud-cloudfoundry-web</artifactId>
-  <version>2.2.0.BUILD-SNAPSHOT</version>
+  <version>2.2.1.BUILD-SNAPSHOT</version>
   <description>Spring Cloud CloudFoundry Web</description>
   <url>https://spring.io/spring-cloud/spring-cloud-cloudfoundry/spring-cloud-cloudfoundry-web</url>
   <organization>
diff --git a/spring-cloud-starter-cloudfoundry/.flattened-pom.xml b/spring-cloud-starter-cloudfoundry/.flattened-pom.xml
index 0d77a22..6ab2d86 100644
--- a/spring-cloud-starter-cloudfoundry/.flattened-pom.xml
+++ b/spring-cloud-starter-cloudfoundry/.flattened-pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-cloudfoundry</artifactId>
-    <version>2.2.0.BUILD-SNAPSHOT</version>
+    <version>2.2.1.BUILD-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.springframework.cloud</groupId>
   <artifactId>spring-cloud-starter-cloudfoundry</artifactId>
-  <version>2.2.0.BUILD-SNAPSHOT</version>
+  <version>2.2.1.BUILD-SNAPSHOT</version>
   <name>spring-cloud-starter-cloudfoundry</name>
   <description>Spring Cloud Starter</description>
   <url>https://projects.spring.io/spring-cloud</url>
@@ -100,7 +100,7 @@
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-starter</artifactId>
-      <version>2.2.0.BUILD-SNAPSHOT</version>
+      <version>2.2.1.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>