diff --git a/README.adoc b/README.adoc
index 3dae46493f..37aeff2aef 100644
--- a/README.adoc
+++ b/README.adoc
@@ -205,6 +205,57 @@ Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on t
 
 IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
 
+=== Duplicate Finder
+
+Spring Cloud Build brings along the  `basepom:duplicate-finder-maven-plugin`, that enables flagging duplicate and conflicting classes and resources on the java classpath.
+
+==== Duplicate Finder configuration
+
+Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the projecst's `pom.xml`.
+
+.pom.xml
+[source,xml]
+----
+<build>
+    <plugins>
+        <plugin>
+            <groupId>org.basepom.maven</groupId>
+            <artifactId>duplicate-finder-maven-plugin</artifactId>
+        </plugin>
+    </plugins>
+</build>
+----
+
+For other properties, we have set defaults as listed in the https://github.com/basepom/duplicate-finder-maven-plugin/wiki[plugin documentation].
+
+You can easily override them but setting the value of the selected property prefixed with `duplicate-finder-maven-plugin`. For example, set `duplicate-finder-maven-plugin.skip` to `true` in order to skip duplicates check in your build.
+
+If you need to add `ignoredClassPatterns` or `ignoredResourcePatterns` to your setup, make sure to add them in the plugin configuration section of your project:
+
+[source,xml]
+----
+<build>
+    <plugins>
+        <plugin>
+            <groupId>org.basepom.maven</groupId>
+            <artifactId>duplicate-finder-maven-plugin</artifactId>
+            <configuration>
+                <ignoredClassPatterns>
+                    <ignoredClassPattern>org.joda.time.base.BaseDateTime</ignoredClassPattern>
+                    <ignoredClassPattern>.*module-info</ignoredClassPattern>
+                </ignoredClassPatterns>
+                <ignoredResourcePatterns>
+                    <ignoredResourcePattern>changelog.txt</ignoredResourcePattern>
+                </ignoredResourcePatterns>
+            </configuration>
+        </plugin>
+    </plugins>
+</build>
+
+
+----
+
+
 == How to Build Spring Cloud Contract
 
 === Cloning the repository on Windows
diff --git a/docker/spring-cloud-contract-docker/project/gradle.properties b/docker/spring-cloud-contract-docker/project/gradle.properties
index 32526effea..f8cc36b457 100644
--- a/docker/spring-cloud-contract-docker/project/gradle.properties
+++ b/docker/spring-cloud-contract-docker/project/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.daemon=false
 verifierVersion=3.0.5-SNAPSHOT
-springBootVersion=2.4.10
+springBootVersion=2.4.13
 camelVersion=3.4.3
\ No newline at end of file
diff --git a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml
index 8dfacdb67c..35d18b08e2 100644
--- a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml
+++ b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml
@@ -11,14 +11,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.10</version>
+		<version>2.4.13</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>2020.0.4-SNAPSHOT</spring-cloud.version>
+		<spring-cloud.version>2020.0.5-SNAPSHOT</spring-cloud.version>
 	</properties>
 
 	<dependencies>
diff --git a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml
index 155f800c62..d67828fc86 100644
--- a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml
+++ b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml
@@ -11,14 +11,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.10</version>
+		<version>2.4.13</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>2020.0.4-SNAPSHOT</spring-cloud.version>
+		<spring-cloud.version>2020.0.5-SNAPSHOT</spring-cloud.version>
 		<spring-cloud-contract.version>3.0.5-SNAPSHOT</spring-cloud-contract.version>
 	</properties>
 
diff --git a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml
index 30a92c28bc..78ced8cf6d 100644
--- a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml
+++ b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.10</version>
+		<version>2.4.13</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml
index 0ea9258992..8328e19c8e 100644
--- a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml
+++ b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml
@@ -11,14 +11,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.10</version>
+		<version>2.4.13</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>2020.0.4-SNAPSHOT</spring-cloud.version>
+		<spring-cloud.version>2020.0.5-SNAPSHOT</spring-cloud.version>
 		<spring-cloud-contract.version>3.0.5-SNAPSHOT</spring-cloud-contract.version>
 	</properties>
 
diff --git a/pom.xml b/pom.xml
index 19c8cc3a34..f0e0bc6c3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.0.4</version>
+		<version>3.0.5-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
@@ -28,9 +28,9 @@
 		<checkstyle.version>2.17</checkstyle.version>
 		<pact.version>4.0.10</pact.version>
 		<jsch-agent.version>0.0.9</jsch-agent.version>
-		<spring-cloud-build.version>3.0.4</spring-cloud-build.version>
-		<spring-cloud-zookeeper.version>3.0.5-SNAPSHOT</spring-cloud-zookeeper.version>
-		<spring-cloud-stream.version>3.1.4</spring-cloud-stream.version>
+		<spring-cloud-build.version>3.0.5-SNAPSHOT</spring-cloud-build.version>
+		<spring-cloud-zookeeper.version>3.0.4-SNAPSHOT</spring-cloud-zookeeper.version>
+		<spring-cloud-stream.version>3.1.6-SNAPSHOT</spring-cloud-stream.version>
 		<spring-cloud-netflix.version>3.0.5-SNAPSHOT</spring-cloud-netflix.version>
 		<spring-cloud-consul.version>3.0.5-SNAPSHOT</spring-cloud-consul.version>
 		<spring-cloud-commons.version>3.0.5-SNAPSHOT</spring-cloud-commons.version>
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties
index 2c576c7e00..afc5f2fa9d 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties
@@ -18,4 +18,4 @@ nexusPassword=
 verifierVersion=3.0.5-SNAPSHOT
 org.gradle.daemon=false
 aetherVersion=1.1.0
-springCloudBuildVersion=3.0.4
+springCloudBuildVersion=3.0.5-SNAPSHOT
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties
index 59f0596055..f438c235e6 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties
@@ -16,5 +16,5 @@
 wiremockVersion=2.30.1
 jsonAssertVersion=0.6.1
 verifierVersion=3.0.5-SNAPSHOT
-bootVersion=2.4.10
+bootVersion=2.4.13
 groovyVersion=2.4.17
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties
index 59f0596055..f438c235e6 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties
@@ -16,5 +16,5 @@
 wiremockVersion=2.30.1
 jsonAssertVersion=0.6.1
 verifierVersion=3.0.5-SNAPSHOT
-bootVersion=2.4.10
+bootVersion=2.4.13
 groovyVersion=2.4.17