diff --git a/parent-boot-2/pom.xml b/parent-boot-2/pom.xml
index 280d226e95..ef156e2e6a 100644
--- a/parent-boot-2/pom.xml
+++ b/parent-boot-2/pom.xml
@@ -78,8 +78,6 @@
         <rest-assured.version>3.1.0</rest-assured.version>
         <!-- plugins -->
         <thin.version>1.0.11.RELEASE</thin.version>
-        <spring-boot.version>2.1.1.RELEASE</spring-boot.version>
+        <spring-boot.version>2.1.3.RELEASE</spring-boot.version>
     </properties>
 </project>
-
-
diff --git a/spring-boot-bootstrap/pom.xml b/spring-boot-bootstrap/pom.xml
index f13801f532..70ebb225c8 100644
--- a/spring-boot-bootstrap/pom.xml
+++ b/spring-boot-bootstrap/pom.xml
@@ -84,7 +84,7 @@
 			<id>openshift</id>
 			<properties>
 				<spring-cloud-k8s.version>0.3.0.RELEASE</spring-cloud-k8s.version>
-				<spring-cloud.version>Finchley.SR2</spring-cloud.version>
+				<spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
 				<fabric8.maven.plugin.version>3.5.37</fabric8.maven.plugin.version>
 			</properties>
 			<dependencyManagement>
@@ -166,7 +166,7 @@
 					<dependency>
 						<groupId>org.springframework.cloud</groupId>
 						<artifactId>spring-cloud-dependencies</artifactId>
-						<version>Finchley.SR1</version>
+						<version>Greenwich.RELEASE</version>
 						<type>pom</type>
 						<scope>import</scope>
 					</dependency>
@@ -214,7 +214,7 @@
 					<dependency>
 						<groupId>org.springframework.cloud</groupId>
 						<artifactId>spring-cloud-dependencies</artifactId>
-						<version>Finchley.SR1</version>
+						<version>Greenwich.RELEASE</version>
 						<type>pom</type>
 						<scope>import</scope>
 					</dependency>
diff --git a/spring-boot-bootstrap/src/main/java/com/baeldung/Application.java b/spring-boot-bootstrap/src/main/java/com/baeldung/Application.java
index 567e9b2678..d5a597e48b 100644
--- a/spring-boot-bootstrap/src/main/java/com/baeldung/Application.java
+++ b/spring-boot-bootstrap/src/main/java/com/baeldung/Application.java
@@ -4,12 +4,10 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.boot.web.servlet.ServletComponentScan;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @ServletComponentScan
-@SpringBootApplication
-@ComponentScan("com.baeldung")
+@SpringBootApplication(scanBasePackages = "com.baeldung")
 @EnableJpaRepositories("com.baeldung.persistence.repo")
 @EntityScan("com.baeldung.persistence.model")
 public class Application {
diff --git a/spring-boot-bootstrap/src/main/resources/templates/error.html b/spring-boot-bootstrap/src/main/resources/templates/error.html
index f2b51a1938..ca3a740b71 100644
--- a/spring-boot-bootstrap/src/main/resources/templates/error.html
+++ b/spring-boot-bootstrap/src/main/resources/templates/error.html
@@ -1,19 +1,19 @@
-<html lang="en">
+<html lang="en" xmlns:th="http://www.w3.org/1999/xhtml">
 <head>
 <title>Error Occurred</title>
 <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" />
 </head>
 <body>
     <div class="container">
-            <h1>Error Occurred!</h1>    
-      <div class="alert alert-danger" role="alert">
+        <h1>Error Occurred!</h1>
+        <div class="alert alert-danger" role="alert">
             <b>
             [<span th:text="${status}">status</span>]
             <span th:text="${error}">error</span>
             </b>
             <p th:text="${message}">message</p>
-       </div>     
+        </div>
     </div>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/spring-boot-bootstrap/src/main/resources/templates/home.html b/spring-boot-bootstrap/src/main/resources/templates/home.html
index 5707cfb82a..0428ca1127 100644
--- a/spring-boot-bootstrap/src/main/resources/templates/home.html
+++ b/spring-boot-bootstrap/src/main/resources/templates/home.html
@@ -1,7 +1,7 @@
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml" lang="en">
 <head><title>Home Page</title></head>
 <body>
 	<h1>Hello !</h1>
 	<p>Welcome to <span th:text="${appName}">Our App</span></p>
 </body>
-</html>
\ No newline at end of file
+</html>
