diff --git a/samples/pom.xml b/samples/pom.xml
index 5593036e94..507f0b65c8 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -20,14 +20,14 @@
 		<main.basedir>${basedir}/..</main.basedir>
 	</properties>
 
-    <modules>
-        <module>wiremock-native</module>
-        <module>wiremock-jetty</module>
-        <module>wiremock-tomcat</module>
-        <module>wiremock-undertow</module>
-        <module>wiremock-undertow-ssl</module>
+	<modules>
+		<module>wiremock-native</module>
+		<module>wiremock-jetty</module>
+		<module>wiremock-tomcat</module>
+		<module>wiremock-undertow</module>
+		<module>wiremock-undertow-ssl</module>
 		<!-- standalone tests get executed separately by invoker plugin -->
-    </modules>
+	</modules>
 
 	<dependencies>
 		<dependency>
@@ -47,15 +47,15 @@
 		</dependency>
 	</dependencies>
 
- 	<build>
+	<build>
 		<plugins>
-	        <plugin>
-		      <artifactId>maven-deploy-plugin</artifactId>
-			  <version>2.8.2</version>
-		      <configuration>
-		        <skip>true</skip>
-		      </configuration>
-	        </plugin>
+			<plugin>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8.2</version>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 
diff --git a/samples/standalone/pom.xml b/samples/standalone/pom.xml
index dea61ec965..c44d15f4fe 100644
--- a/samples/standalone/pom.xml
+++ b/samples/standalone/pom.xml
@@ -26,6 +26,8 @@
 		<module>dsl</module>
 		<module>messaging</module>
 		<module>pact</module>
+		<module>webclient</module>
+		<module>yml</module>
 	</modules>
 
 	<build>
diff --git a/samples/standalone/yml/http-client/build.gradle b/samples/standalone/yml/http-client/build.gradle
index 4ccbb0a3fc..c549eaa389 100644
--- a/samples/standalone/yml/http-client/build.gradle
+++ b/samples/standalone/yml/http-client/build.gradle
@@ -24,6 +24,7 @@ repositories {
 
 apply plugin: 'groovy'
 apply plugin: 'org.springframework.boot'
+apply plugin: 'io.spring.dependency-management'
 apply plugin: 'maven-publish'
 
 dependencyManagement {
diff --git a/samples/standalone/yml/http-server/build.gradle b/samples/standalone/yml/http-server/build.gradle
index a61ca1bc72..44e3909325 100644
--- a/samples/standalone/yml/http-server/build.gradle
+++ b/samples/standalone/yml/http-server/build.gradle
@@ -29,8 +29,9 @@ repositories {
 
 apply plugin: 'groovy'
 apply plugin: 'org.springframework.boot'
-apply plugin: 'spring-cloud-contract'
+apply plugin: 'io.spring.dependency-management'
 apply plugin: 'maven-publish'
+apply plugin: 'maven'
 
 dependencyManagement {
 	imports {