diff --git a/docs/pom.xml b/docs/pom.xml
index ec8bb268..59874526 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-task-parent</artifactId>
-		<version>2.3.5</version>
+		<version>2.3.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-task-docs</artifactId>
 	<name>Spring Cloud Task Docs</name>
diff --git a/pom.xml b/pom.xml
index 28d5306a..ca2cb85e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-task-parent</artifactId>
-	<version>2.3.5</version>
+	<version>2.3.5-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Task Build</name>
 	<description>Spring Cloud Task Build</description>
diff --git a/spring-cloud-starter-single-step-batch-job/pom.xml b/spring-cloud-starter-single-step-batch-job/pom.xml
index 6ea1f821..114a9141 100644
--- a/spring-cloud-starter-single-step-batch-job/pom.xml
+++ b/spring-cloud-starter-single-step-batch-job/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>spring-cloud-task-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.3.5</version>
+		<version>2.3.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
 		<test.rabbit.containers.version>1.15.2</test.rabbit.containers.version>
 		<test.ducttape.version>1.0.8</test.ducttape.version>
 		<spring-kafka-version>2.6.6</spring-kafka-version>
-		<spring-cloud-stream.version>3.1.6</spring-cloud-stream.version>
+		<spring-cloud-stream.version>3.1.4</spring-cloud-stream.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-cloud-starter-task/pom.xml b/spring-cloud-starter-task/pom.xml
index abea3029..1485aa52 100644
--- a/spring-cloud-starter-task/pom.xml
+++ b/spring-cloud-starter-task/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-task-parent</artifactId>
-		<version>2.3.5</version>
+		<version>2.3.5-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-cloud-starter-task</artifactId>
diff --git a/spring-cloud-task-batch/pom.xml b/spring-cloud-task-batch/pom.xml
index 0e1893d3..ea89fa9e 100644
--- a/spring-cloud-task-batch/pom.xml
+++ b/spring-cloud-task-batch/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-task-parent</artifactId>
-		<version>2.3.5</version>
+		<version>2.3.5-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-cloud-task-batch</artifactId>
diff --git a/spring-cloud-task-core/pom.xml b/spring-cloud-task-core/pom.xml
index 35cd8570..e1a07009 100755
--- a/spring-cloud-task-core/pom.xml
+++ b/spring-cloud-task-core/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-task-parent</artifactId>
-		<version>2.3.5</version>
+		<version>2.3.5-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-cloud-task-core</artifactId>
diff --git a/spring-cloud-task-dependencies/.flattened-pom.xml b/spring-cloud-task-dependencies/.flattened-pom.xml
deleted file mode 100644
index a0d29c7f..00000000
--- a/spring-cloud-task-dependencies/.flattened-pom.xml
+++ /dev/null
@@ -1,160 +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>3.0.5</version>
-    <relativePath></relativePath>
-  </parent>
-  <groupId>org.springframework.cloud</groupId>
-  <artifactId>spring-cloud-task-dependencies</artifactId>
-  <version>2.3.5</version>
-  <packaging>pom</packaging>
-  <name>Spring Cloud Task Dependencies</name>
-  <description>Spring Cloud Task Dependencies</description>
-  <url>https://projects.spring.io/spring-cloud/spring-cloud-task-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-task-dependencies</connection>
-    <developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git/spring-cloud-task-dependencies</developerConnection>
-    <url>https://github.com/spring-cloud/spring-cloud-build/spring-cloud-task-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>https:/docs.spring.io/spring-cloud-dependencies-parent/docs/3.0.5/reference/html/spring-cloud-task-dependencies/</url>
-    </site>
-    <downloadUrl>https://github.com/spring-cloud</downloadUrl>
-  </distributionManagement>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-starter-task</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-task-core</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-task-batch</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-task-stream</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <profiles>
-    <profile>
-      <id>spring</id>
-      <repositories>
-        <repository>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-          <id>spring-snapshots</id>
-          <name>Spring Snapshots</name>
-          <url>https://repo.spring.io/snapshot</url>
-        </repository>
-        <repository>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-          <id>spring-milestones</id>
-          <name>Spring Milestones</name>
-          <url>https://repo.spring.io/milestone</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>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-          <id>spring-snapshots</id>
-          <name>Spring Snapshots</name>
-          <url>https://repo.spring.io/snapshot</url>
-        </pluginRepository>
-        <pluginRepository>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-          <id>spring-milestones</id>
-          <name>Spring Milestones</name>
-          <url>https://repo.spring.io/milestone</url>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-  </profiles>
-</project>
diff --git a/spring-cloud-task-dependencies/pom.xml b/spring-cloud-task-dependencies/pom.xml
index e000e6ed..4455cf0f 100644
--- a/spring-cloud-task-dependencies/pom.xml
+++ b/spring-cloud-task-dependencies/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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-task-dependencies</artifactId>
-	<version>2.3.5</version>
+	<version>2.3.5-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Task Dependencies</name>
 	<description>Spring Cloud Task Dependencies</description>
@@ -10,7 +10,7 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.0.5</version>
+		<version>3.0.5-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 
diff --git a/spring-cloud-task-integration-tests/pom.xml b/spring-cloud-task-integration-tests/pom.xml
index d63f16c7..dcc92979 100644
--- a/spring-cloud-task-integration-tests/pom.xml
+++ b/spring-cloud-task-integration-tests/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>spring-cloud-task-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.3.5</version>
+		<version>2.3.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<name>Spring Cloud Task Integration Tests</name>
diff --git a/spring-cloud-task-samples/pom.xml b/spring-cloud-task-samples/pom.xml
index 45c42cd8..82a73e33 100644
--- a/spring-cloud-task-samples/pom.xml
+++ b/spring-cloud-task-samples/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-task-parent</artifactId>
-		<version>2.3.5</version>
+		<version>2.3.5-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/spring-cloud-task-stream/pom.xml b/spring-cloud-task-stream/pom.xml
index c4af0161..b00e1113 100644
--- a/spring-cloud-task-stream/pom.xml
+++ b/spring-cloud-task-stream/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-task-parent</artifactId>
-		<version>2.3.5</version>
+		<version>2.3.5-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>