diff --git a/samples/standalone/yml/http-client/build.gradle b/samples/standalone/yml/http-client/build.gradle
index 752be56a53..8b2795acce 100644
--- a/samples/standalone/yml/http-client/build.gradle
+++ b/samples/standalone/yml/http-client/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 		maven { url "http://repo.spring.io/release" }
 	}
 	dependencies {
-		classpath "org.springframework.boot:spring-boot-gradle-plugin:1.5.9.RELEASE"
+		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.0.0.M6"
 	}
 }
 
diff --git a/samples/standalone/yml/http-client/gradle.properties b/samples/standalone/yml/http-client/gradle.properties
index 0c444e9a19..d765e1c4aa 100644
--- a/samples/standalone/yml/http-client/gradle.properties
+++ b/samples/standalone/yml/http-client/gradle.properties
@@ -1,2 +1,2 @@
 org.gradle.daemon=false
-BOM_VERSION=Edgware.BUILD-SNAPSHOT
\ No newline at end of file
+BOM_VERSION=Finchley.BUILD-SNAPSHOT
diff --git a/samples/standalone/yml/http-client/pom.xml b/samples/standalone/yml/http-client/pom.xml
index b768a828d7..0da01ca73e 100644
--- a/samples/standalone/yml/http-client/pom.xml
+++ b/samples/standalone/yml/http-client/pom.xml
@@ -13,14 +13,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.9.RELEASE</version>
+		<version>2.0.0.M6</version>
 		<relativePath />
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud-dependencies.version>Edgware.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
+		<spring-cloud-dependencies.version>Finchley.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
 	</properties>
 
 	<dependencies>
diff --git a/samples/standalone/yml/http-server/build.gradle b/samples/standalone/yml/http-server/build.gradle
index 95237b337a..407f1e2fc8 100644
--- a/samples/standalone/yml/http-server/build.gradle
+++ b/samples/standalone/yml/http-server/build.gradle
@@ -9,7 +9,7 @@ buildscript {
 	}
 // end::repos[]
 	dependencies {
-		classpath "org.springframework.boot:spring-boot-gradle-plugin:1.5.9.RELEASE"
+		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.0.0.M6"
 		classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}"
 	}
 }
diff --git a/samples/standalone/yml/http-server/gradle.properties b/samples/standalone/yml/http-server/gradle.properties
index b99fcb4df7..4aa503e80a 100644
--- a/samples/standalone/yml/http-server/gradle.properties
+++ b/samples/standalone/yml/http-server/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=false
-verifierVersion=1.2.2.BUILD-SNAPSHOT
-BOM_VERSION=Edgware.BUILD-SNAPSHOT
\ No newline at end of file
+verifierVersion=2.0.0.BUILD-SNAPSHOT
+BOM_VERSION=Finchley.BUILD-SNAPSHOT
diff --git a/samples/standalone/yml/http-server/pom.xml b/samples/standalone/yml/http-server/pom.xml
index 271415af62..8f22f31234 100644
--- a/samples/standalone/yml/http-server/pom.xml
+++ b/samples/standalone/yml/http-server/pom.xml
@@ -13,15 +13,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.9.RELEASE</version>
+		<version>2.0.0.M6</version>
 		<relativePath />
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>1.2.2.BUILD-SNAPSHOT</spring-cloud-contract.version>
-		<spring-cloud-dependencies.version>Edgware.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
+		<spring-cloud-contract.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-dependencies.version>Finchley.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
 	</properties>
 
 	<dependencies>
@@ -105,7 +105,7 @@
 		</plugins>
 		<pluginManagement>
 			<plugins>
-				<!--This plugin's configuration is used to store Eclipse m2e settings 
+				<!--This plugin's configuration is used to store Eclipse m2e settings
 					only. It has no influence on the Maven build itself. -->
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
diff --git a/samples/standalone/yml/pom.xml b/samples/standalone/yml/pom.xml
index 651f948829..85c4bb6199 100644
--- a/samples/standalone/yml/pom.xml
+++ b/samples/standalone/yml/pom.xml
@@ -17,7 +17,7 @@
 	<description>Spring Cloud Contract Standalone Test Samples used for end to end tests</description>
 
 	<properties>
-		<spring-cloud-contract.version>1.2.2.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>
 
 	<modules>