diff --git a/spring-security-rest-full/src/main/java/org/baeldung/spring/Application.java b/spring-security-rest-full/src/main/java/org/baeldung/spring/Application.java
index f8bc6c0160..a43b21c2b7 100644
--- a/spring-security-rest-full/src/main/java/org/baeldung/spring/Application.java
+++ b/spring-security-rest-full/src/main/java/org/baeldung/spring/Application.java
@@ -1,12 +1,18 @@
 package org.baeldung.spring;
 
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.context.request.RequestContextListener;
 import org.springframework.web.filter.ShallowEtagHeaderFilter;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 /**
  * Main Application Class - uses Spring Boot. Just run this as a normal Java
@@ -16,7 +22,19 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 @EnableScheduling
 @EnableAutoConfiguration
 @ComponentScan("org.baeldung")
-public class Application extends WebMvcConfigurerAdapter {
+@SpringBootApplication
+public class Application extends SpringBootServletInitializer {
+
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+        return application.sources(Application.class);
+    }
+
+    @Override
+    public void onStartup(ServletContext sc) throws ServletException {
+        // Manages the lifecycle of the root application context
+        sc.addListener(new RequestContextListener());
+    }
 
     public static void main(final String[] args) {
         SpringApplication.run(Application.class, args);
diff --git a/spring-security-rest-full/src/main/java/org/baeldung/spring/ListenerConfig.java b/spring-security-rest-full/src/main/java/org/baeldung/spring/ListenerConfig.java
deleted file mode 100644
index 3d727fc19f..0000000000
--- a/spring-security-rest-full/src/main/java/org/baeldung/spring/ListenerConfig.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.baeldung.spring;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-
-import org.springframework.web.WebApplicationInitializer;
-import org.springframework.web.context.request.RequestContextListener;
-
-public class ListenerConfig implements WebApplicationInitializer {
-
-    @Override
-    public void onStartup(ServletContext sc) throws ServletException {
-        // Manages the lifecycle of the root application context
-        sc.addListener(new RequestContextListener());
-    }
-}
\ No newline at end of file
diff --git a/spring-security-rest-full/src/main/resources/application.properties b/spring-security-rest-full/src/main/resources/application.properties
index 58c6f8eec7..c3e1f0b4bb 100644
--- a/spring-security-rest-full/src/main/resources/application.properties
+++ b/spring-security-rest-full/src/main/resources/application.properties
@@ -1,2 +1,3 @@
 server.port=8082
-server.context-path=/spring-security-rest-full
\ No newline at end of file
+server.context-path=/spring-security-rest-full
+endpoints.metrics.enabled=true
\ No newline at end of file