diff --git a/pom.xml b/pom.xml
index 3bb216691..697489ef9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
 		<java.version>1.8</java.version>
 		<reactor.version>3.0.4.RELEASE</reactor.version>
 		<spring-cloud-stream.version>Brooklyn.SR2</spring-cloud-stream.version>
-		<wrapper.version>1.0.0.M1</wrapper.version>
+		<wrapper.version>1.0.0.BUILD-SNAPSHOT</wrapper.version>
 		<spring-boot.version>1.5.1.RELEASE</spring-boot.version>
 	</properties>
 
@@ -60,7 +60,7 @@
 					<dependencies>
 						<dependency>
 							<groupId>org.springframework.boot.experimental</groupId>
-							<artifactId>spring-boot-thin-launcher</artifactId>
+							<artifactId>spring-boot-thin-layout</artifactId>
 							<version>${wrapper.version}</version>
 						</dependency>
 					</dependencies>
diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml
index 8fdeb89f0..9327d62f1 100644
--- a/spring-cloud-function-compiler/pom.xml
+++ b/spring-cloud-function-compiler/pom.xml
@@ -55,7 +55,7 @@
 				<dependencies>
 					<dependency>
 						<groupId>org.springframework.boot.experimental</groupId>
-						<artifactId>spring-boot-thin-launcher</artifactId>
+						<artifactId>spring-boot-thin-layout</artifactId>
 						<version>${wrapper.version}</version>
 					</dependency>
 				</dependencies>
diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml
index a6250b510..8fc5e0c7e 100644
--- a/spring-cloud-function-deployer/pom.xml
+++ b/spring-cloud-function-deployer/pom.xml
@@ -16,7 +16,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-deployer-thin.version>1.0.0.M1</spring-cloud-deployer-thin.version>
+		<spring-cloud-deployer-thin.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-deployer-thin.version>
 		<reactor.version>3.0.4.RELEASE</reactor.version>
 	</properties>
 
@@ -82,6 +82,13 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<dependencies>
+					<dependency>
+						<groupId>org.springframework.boot.experimental</groupId>
+						<artifactId>spring-boot-thin-layout</artifactId>
+						<version>${wrapper.version}</version>
+					</dependency>
+				</dependencies>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-compiler/pom.xml b/spring-cloud-function-samples/spring-cloud-function-sample-compiler/pom.xml
index 7caeb3fc8..2cddd2377 100644
--- a/spring-cloud-function-samples/spring-cloud-function-sample-compiler/pom.xml
+++ b/spring-cloud-function-samples/spring-cloud-function-sample-compiler/pom.xml
@@ -20,7 +20,7 @@
 	<properties>
 		<java.version>1.8</java.version>
 		<spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
-		<wrapper.version>1.0.0.M1</wrapper.version>
+		<wrapper.version>1.0.0.BUILD-SNAPSHOT</wrapper.version>
 		<reactor.version>3.0.4.RELEASE</reactor.version>
 	</properties>
 
@@ -52,11 +52,10 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<version>1.5.1.RELEASE</version>
 				<dependencies>
 					<dependency>
 						<groupId>org.springframework.boot.experimental</groupId>
-						<artifactId>spring-boot-thin-launcher</artifactId>
+						<artifactId>spring-boot-thin-layout</artifactId>
 						<version>${wrapper.version}</version>
 					</dependency>
 				</dependencies>
diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/pom.xml b/spring-cloud-function-samples/spring-cloud-function-sample-pojo/pom.xml
index c5feb89cd..9265b90bf 100644
--- a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/pom.xml
+++ b/spring-cloud-function-samples/spring-cloud-function-sample-pojo/pom.xml
@@ -20,7 +20,7 @@
 	<properties>
 		<java.version>1.8</java.version>
 		<spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
-		<wrapper.version>1.0.0.M1</wrapper.version>
+		<wrapper.version>1.0.0.BUILD-SNAPSHOT</wrapper.version>
 		<reactor.version>3.0.4.RELEASE</reactor.version>
 	</properties>
 
@@ -70,7 +70,7 @@
 				<dependencies>
 					<dependency>
 						<groupId>org.springframework.boot.experimental</groupId>
-						<artifactId>spring-boot-thin-launcher</artifactId>
+						<artifactId>spring-boot-thin-layout</artifactId>
 						<version>${wrapper.version}</version>
 					</dependency>
 				</dependencies>
diff --git a/spring-cloud-function-samples/spring-cloud-function-sample/pom.xml b/spring-cloud-function-samples/spring-cloud-function-sample/pom.xml
index 8b25ad5a4..dc7121c89 100644
--- a/spring-cloud-function-samples/spring-cloud-function-sample/pom.xml
+++ b/spring-cloud-function-samples/spring-cloud-function-sample/pom.xml
@@ -20,7 +20,7 @@
 	<properties>
 		<java.version>1.8</java.version>
 		<spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
-		<wrapper.version>1.0.0.M1</wrapper.version>
+		<wrapper.version>1.0.0.BUILD-SNAPSHOT</wrapper.version>
 		<reactor.version>3.0.4.RELEASE</reactor.version>
 		<spring-boot.version>1.5.1.RELEASE</spring-boot.version>
 	</properties>
@@ -63,7 +63,7 @@
 				<dependencies>
 					<dependency>
 						<groupId>org.springframework.boot.experimental</groupId>
-						<artifactId>spring-boot-thin-launcher</artifactId>
+						<artifactId>spring-boot-thin-layout</artifactId>
 						<version>${wrapper.version}</version>
 					</dependency>
 				</dependencies>
diff --git a/spring-cloud-function-stream/pom.xml b/spring-cloud-function-stream/pom.xml
index 0eeadd07e..875fd8d9d 100644
--- a/spring-cloud-function-stream/pom.xml
+++ b/spring-cloud-function-stream/pom.xml
@@ -61,7 +61,7 @@
 				<dependencies>
 					<dependency>
 						<groupId>org.springframework.boot.experimental</groupId>
-						<artifactId>spring-boot-thin-launcher</artifactId>
+						<artifactId>spring-boot-thin-layout</artifactId>
 						<version>${wrapper.version}</version>
 					</dependency>
 				</dependencies>
diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml
index 1c27ab1f6..4697a54cd 100644
--- a/spring-cloud-function-task/pom.xml
+++ b/spring-cloud-function-task/pom.xml
@@ -46,7 +46,7 @@
 				<dependencies>
 					<dependency>
 						<groupId>org.springframework.boot.experimental</groupId>
-						<artifactId>spring-boot-thin-launcher</artifactId>
+						<artifactId>spring-boot-thin-layout</artifactId>
 						<version>${wrapper.version}</version>
 					</dependency>
 				</dependencies>
diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml
index 6f6d16ba7..3830fbf7c 100644
--- a/spring-cloud-function-web/pom.xml
+++ b/spring-cloud-function-web/pom.xml
@@ -42,7 +42,7 @@
 				<dependencies>
 					<dependency>
 						<groupId>org.springframework.boot.experimental</groupId>
-						<artifactId>spring-boot-thin-launcher</artifactId>
+						<artifactId>spring-boot-thin-layout</artifactId>
 						<version>${wrapper.version}</version>
 					</dependency>
 				</dependencies>