diff --git a/.flattened-pom.xml b/.flattened-pom.xml
index 91504edb..2fe92542 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.1.RELEASE</version>
+    <version>2.2.1.BUILD-SNAPSHOT</version>
     <relativePath></relativePath>
   </parent>
   <groupId>org.springframework.cloud</groupId>
   <artifactId>spring-cloud-openfeign</artifactId>
-  <version>2.2.1.RELEASE</version>
+  <version>2.2.1.BUILD-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Spring Cloud OpenFeign</name>
   <description>Spring Cloud OpenFeign</description>
diff --git a/docs/.flattened-pom.xml b/docs/.flattened-pom.xml
index 4459a6cd..4b50f1e3 100644
--- a/docs/.flattened-pom.xml
+++ b/docs/.flattened-pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-openfeign</artifactId>
-    <version>2.2.1.RELEASE</version>
+    <version>2.2.1.BUILD-SNAPSHOT</version>
   </parent>
   <groupId>org.springframework.cloud</groupId>
   <artifactId>spring-cloud-openfeign-docs</artifactId>
-  <version>2.2.1.RELEASE</version>
+  <version>2.2.1.BUILD-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Spring Cloud OpenFeign Docs</name>
   <description>Spring Cloud Docs</description>
@@ -100,7 +100,7 @@
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-starter-openfeign</artifactId>
-      <version>2.2.1.RELEASE</version>
+      <version>2.2.1.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/docs/pom.xml b/docs/pom.xml
index bc44e391..ba00d710 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.2.1.RELEASE</version>
+		<version>2.2.1.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-openfeign-docs</artifactId>
 	<packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
index fa7b1e70..7435e2b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,14 +4,14 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-openfeign</artifactId>
-	<version>2.2.1.RELEASE</version>
+	<version>2.2.1.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud OpenFeign</name>
 	<description>Spring Cloud OpenFeign</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.1.RELEASE</version>
+		<version>2.2.1.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -26,8 +26,8 @@
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.7.3</jackson.version>
-		<spring-cloud-commons.version>2.2.1.RELEASE</spring-cloud-commons.version>
-		<spring-cloud-netflix.version>2.2.1.RELEASE</spring-cloud-netflix.version>
+		<spring-cloud-commons.version>2.2.1.BUILD-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-netflix.version>2.2.1.BUILD-SNAPSHOT</spring-cloud-netflix.version>
 
 		<!-- Plugin versions -->
 		<maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
diff --git a/spring-cloud-openfeign-core/.flattened-pom.xml b/spring-cloud-openfeign-core/.flattened-pom.xml
index d3cf4f39..a3318671 100644
--- a/spring-cloud-openfeign-core/.flattened-pom.xml
+++ b/spring-cloud-openfeign-core/.flattened-pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-openfeign</artifactId>
-    <version>2.2.1.RELEASE</version>
+    <version>2.2.1.BUILD-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.springframework.cloud</groupId>
   <artifactId>spring-cloud-openfeign-core</artifactId>
-  <version>2.2.1.RELEASE</version>
+  <version>2.2.1.BUILD-SNAPSHOT</version>
   <name>Spring Cloud OpenFeign Core</name>
   <description>Spring Cloud OpenFeign Core</description>
   <url>https://spring.io/spring-cloud/spring-cloud-openfeign/spring-cloud-openfeign-core</url>
@@ -106,7 +106,7 @@
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-netflix-ribbon</artifactId>
-      <version>2.2.1.RELEASE</version>
+      <version>2.2.1.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -188,14 +188,14 @@
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-commons</artifactId>
-      <version>2.2.1.RELEASE</version>
+      <version>2.2.1.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-context</artifactId>
-      <version>2.2.1.RELEASE</version>
+      <version>2.2.1.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
@@ -384,7 +384,7 @@
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-loadbalancer</artifactId>
-      <version>2.2.1.RELEASE</version>
+      <version>2.2.1.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml
index 8c703d6f..a86ddf32 100644
--- a/spring-cloud-openfeign-core/pom.xml
+++ b/spring-cloud-openfeign-core/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.2.1.RELEASE</version>
+		<version>2.2.1.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-openfeign-core</artifactId>
diff --git a/spring-cloud-openfeign-dependencies/.flattened-pom.xml b/spring-cloud-openfeign-dependencies/.flattened-pom.xml
deleted file mode 100644
index 1e8ab9e1..00000000
--- a/spring-cloud-openfeign-dependencies/.flattened-pom.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-dependencies-parent</artifactId>
-    <version>2.2.1.RELEASE</version>
-    <relativePath></relativePath>
-  </parent>
-  <groupId>org.springframework.cloud</groupId>
-  <artifactId>spring-cloud-openfeign-dependencies</artifactId>
-  <version>2.2.1.RELEASE</version>
-  <packaging>pom</packaging>
-  <name>spring-cloud-openfeign-dependencies</name>
-  <description>Spring Cloud OpenFeign Dependencies</description>
-  <url>https://projects.spring.io/spring-cloud/spring-cloud-openfeign-dependencies/</url>
-  <organization>
-    <name>Pivotal Software, Inc.</name>
-    <url>https://www.spring.io</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>https://www.apache.org/licenses/LICENSE-2.0</url>
-      <comments>Copyright 2014-2015 the original author or authors.
-
-				Licensed under the Apache License, Version 2.0 (the "License");
-				you may not use this file except in compliance with the License.
-				You may obtain a copy of the License at
-
-				https://www.apache.org/licenses/LICENSE-2.0
-
-				Unless required by applicable law or agreed to in writing, software
-				distributed under the License is distributed on an "AS IS" BASIS,
-				WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-				implied.
-
-				See the License for the specific language governing permissions and
-				limitations under the License.</comments>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <id>dsyer</id>
-      <name>Dave Syer</name>
-      <email>dsyer at pivotal.io</email>
-      <organization>Pivotal Software, Inc.</organization>
-      <organizationUrl>https://www.spring.io</organizationUrl>
-      <roles>
-        <role>Project lead</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>sgibb</id>
-      <name>Spencer Gibb</name>
-      <email>sgibb at pivotal.io</email>
-      <organization>Pivotal Software, Inc.</organization>
-      <organizationUrl>https://www.spring.io</organizationUrl>
-      <roles>
-        <role>Project lead</role>
-      </roles>
-    </developer>
-  </developers>
-  <scm>
-    <connection>scm:git:git://github.com/spring-cloud/spring-cloud-build.git/spring-cloud-openfeign-dependencies</connection>
-    <developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git/spring-cloud-openfeign-dependencies</developerConnection>
-    <url>https://github.com/spring-cloud/spring-cloud-build/spring-cloud-openfeign-dependencies</url>
-  </scm>
-  <distributionManagement>
-    <repository>
-      <id>repo.spring.io</id>
-      <name>Spring Release Repository</name>
-      <url>https://repo.spring.io/libs-release-local</url>
-    </repository>
-    <snapshotRepository>
-      <id>repo.spring.io</id>
-      <name>Spring Snapshot Repository</name>
-      <url>https://repo.spring.io/libs-snapshot-local</url>
-    </snapshotRepository>
-    <site>
-      <id>spring-docs</id>
-      <url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/spring-cloud-dependencies-parent/2.2.1.RELEASE/spring-cloud-openfeign-dependencies</url>
-    </site>
-    <downloadUrl>https://github.com/spring-cloud</downloadUrl>
-  </distributionManagement>
-  <properties>
-    <feign-form.version>3.8.0</feign-form.version>
-    <feign.version>10.4.0</feign.version>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-openfeign-core</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-starter-openfeign</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.openfeign</groupId>
-        <artifactId>feign-core</artifactId>
-        <version>${feign.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.openfeign.form</groupId>
-        <artifactId>feign-form-spring</artifactId>
-        <version>${feign-form.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.openfeign</groupId>
-        <artifactId>feign-slf4j</artifactId>
-        <version>${feign.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.openfeign</groupId>
-        <artifactId>feign-httpclient</artifactId>
-        <version>${feign.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.openfeign</groupId>
-        <artifactId>feign-hystrix</artifactId>
-        <version>${feign.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.openfeign</groupId>
-        <artifactId>feign-java8</artifactId>
-        <version>${feign.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.openfeign</groupId>
-        <artifactId>feign-okhttp</artifactId>
-        <version>${feign.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.openfeign</groupId>
-        <artifactId>feign-gson</artifactId>
-        <version>${feign.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.openfeign</groupId>
-        <artifactId>feign-jackson-jaxb</artifactId>
-        <version>${feign.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.openfeign</groupId>
-        <artifactId>feign-jackson</artifactId>
-        <version>${feign.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.openfeign</groupId>
-        <artifactId>feign-jaxb</artifactId>
-        <version>${feign.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.openfeign</groupId>
-        <artifactId>feign-jaxrs</artifactId>
-        <version>${feign.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.openfeign</groupId>
-        <artifactId>feign-ribbon</artifactId>
-        <version>${feign.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.openfeign</groupId>
-        <artifactId>feign-sax</artifactId>
-        <version>${feign.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.openfeign</groupId>
-        <artifactId>feign-mock</artifactId>
-        <version>${feign.version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <profiles>
-    <profile>
-      <id>spring</id>
-      <repositories>
-        <repository>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-          <id>spring-snapshots</id>
-          <name>Spring Snapshots</name>
-          <url>https://repo.spring.io/libs-snapshot-local</url>
-        </repository>
-        <repository>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-          <id>spring-milestones</id>
-          <name>Spring Milestones</name>
-          <url>https://repo.spring.io/libs-milestone-local</url>
-        </repository>
-        <repository>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-          <id>spring-releases</id>
-          <name>Spring Releases</name>
-          <url>https://repo.spring.io/release</url>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-          <id>spring-snapshots</id>
-          <name>Spring Snapshots</name>
-          <url>https://repo.spring.io/libs-snapshot-local</url>
-        </pluginRepository>
-        <pluginRepository>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-          <id>spring-milestones</id>
-          <name>Spring Milestones</name>
-          <url>https://repo.spring.io/libs-milestone-local</url>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-  </profiles>
-</project>
diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml
index ff267b48..b425f6f7 100644
--- a/spring-cloud-openfeign-dependencies/pom.xml
+++ b/spring-cloud-openfeign-dependencies/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.2.1.RELEASE</version>
+		<version>2.2.1.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-openfeign-dependencies</artifactId>
-	<version>2.2.1.RELEASE</version>
+	<version>2.2.1.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-openfeign-dependencies</name>
 	<description>Spring Cloud OpenFeign Dependencies</description>
diff --git a/spring-cloud-starter-openfeign/.flattened-pom.xml b/spring-cloud-starter-openfeign/.flattened-pom.xml
index aec89670..6f4d14df 100644
--- a/spring-cloud-starter-openfeign/.flattened-pom.xml
+++ b/spring-cloud-starter-openfeign/.flattened-pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-openfeign</artifactId>
-    <version>2.2.1.RELEASE</version>
+    <version>2.2.1.BUILD-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <groupId>org.springframework.cloud</groupId>
   <artifactId>spring-cloud-starter-openfeign</artifactId>
-  <version>2.2.1.RELEASE</version>
+  <version>2.2.1.BUILD-SNAPSHOT</version>
   <name>Spring Cloud Starter OpenFeign</name>
   <description>Spring Cloud Starter OpenFeign</description>
   <url>https://projects.spring.io/spring-cloud</url>
@@ -100,13 +100,13 @@
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-starter</artifactId>
-      <version>2.2.1.RELEASE</version>
+      <version>2.2.1.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-openfeign-core</artifactId>
-      <version>2.2.1.RELEASE</version>
+      <version>2.2.1.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -118,7 +118,7 @@
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-commons</artifactId>
-      <version>2.2.1.RELEASE</version>
+      <version>2.2.1.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -148,21 +148,21 @@
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
-      <version>2.2.1.RELEASE</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-archaius</artifactId>
-      <version>2.2.1.RELEASE</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-loadbalancer</artifactId>
-      <version>2.2.1.RELEASE</version>
+      <version>2.2.1.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
diff --git a/spring-cloud-starter-openfeign/pom.xml b/spring-cloud-starter-openfeign/pom.xml
index 65b93e8a..6ef69202 100644
--- a/spring-cloud-starter-openfeign/pom.xml
+++ b/spring-cloud-starter-openfeign/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>2.2.1.RELEASE</version>
+		<version>2.2.1.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-openfeign</artifactId>