diff --git a/gradle.properties b/gradle.properties
index 10d38dc0..0c0083f3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
-springBootVersion=2.0.0.M5
+springBootVersion=2.0.0.M6
 version=2.0.0.BUILD-SNAPSHOT
diff --git a/samples/boot/findbyusername/src/main/java/sample/config/SecurityConfig.java b/samples/boot/findbyusername/src/main/java/sample/config/SecurityConfig.java
index fa153ae0..cc2be254 100644
--- a/samples/boot/findbyusername/src/main/java/sample/config/SecurityConfig.java
+++ b/samples/boot/findbyusername/src/main/java/sample/config/SecurityConfig.java
@@ -38,8 +38,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 	@Override
 	public UserDetailsService userDetailsService() {
 		InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
-		manager.createUser(
-				User.withUsername("user").password("password").roles("USER").build());
+		manager.createUser(User.withUsername("user").password("{noop}password")
+				.roles("USER").build());
 		return manager;
 	}
 
diff --git a/samples/boot/jdbc/src/main/java/sample/config/SecurityConfig.java b/samples/boot/jdbc/src/main/java/sample/config/SecurityConfig.java
index 7358ac90..48a86fd9 100644
--- a/samples/boot/jdbc/src/main/java/sample/config/SecurityConfig.java
+++ b/samples/boot/jdbc/src/main/java/sample/config/SecurityConfig.java
@@ -39,8 +39,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 	@Override
 	public UserDetailsService userDetailsService() {
 		InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
-		manager.createUser(
-				User.withUsername("user").password("password").roles("USER").build());
+		manager.createUser(User.withUsername("user").password("{noop}password")
+				.roles("USER").build());
 		return manager;
 	}
 
diff --git a/samples/boot/redis-json/src/main/java/sample/config/SecurityConfig.java b/samples/boot/redis-json/src/main/java/sample/config/SecurityConfig.java
index f0383906..1e23923d 100644
--- a/samples/boot/redis-json/src/main/java/sample/config/SecurityConfig.java
+++ b/samples/boot/redis-json/src/main/java/sample/config/SecurityConfig.java
@@ -38,8 +38,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 	@Override
 	public UserDetailsService userDetailsService() {
 		InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
-		manager.createUser(
-				User.withUsername("user").password("password").roles("USER").build());
+		manager.createUser(User.withUsername("user").password("{noop}password")
+				.roles("USER").build());
 		return manager;
 	}
 
diff --git a/samples/boot/redis/src/main/java/sample/config/SecurityConfig.java b/samples/boot/redis/src/main/java/sample/config/SecurityConfig.java
index 0db01331..044933cc 100644
--- a/samples/boot/redis/src/main/java/sample/config/SecurityConfig.java
+++ b/samples/boot/redis/src/main/java/sample/config/SecurityConfig.java
@@ -38,8 +38,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 	@Override
 	public UserDetailsService userDetailsService() {
 		InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
-		manager.createUser(
-				User.withUsername("user").password("password").roles("USER").build());
+		manager.createUser(User.withUsername("user").password("{noop}password")
+				.roles("USER").build());
 		return manager;
 	}
 
diff --git a/samples/boot/websocket/src/main/java/sample/config/WebSecurityConfig.java b/samples/boot/websocket/src/main/java/sample/config/WebSecurityConfig.java
index 3136073c..6d6eb704 100644
--- a/samples/boot/websocket/src/main/java/sample/config/WebSecurityConfig.java
+++ b/samples/boot/websocket/src/main/java/sample/config/WebSecurityConfig.java
@@ -38,8 +38,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 	@Override
 	public UserDetailsService userDetailsService() {
 		InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
-		manager.createUser(
-				User.withUsername("user").password("password").roles("USER").build());
+		manager.createUser(User.withUsername("user").password("{noop}password")
+				.roles("USER").build());
 		return manager;
 	}