diff --git a/pom.xml b/pom.xml
index 278ee3c9c..439665363 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,8 +51,8 @@
     </modules>
 
     <properties>
-        <spring.boot.version>2.4.1</spring.boot.version>
-        <spring-cloud-dependencies.version>2020.0.0</spring-cloud-dependencies.version>
+        <spring.boot.version>2.6.2</spring.boot.version>
+        <spring-cloud-dependencies.version>2021.0.0</spring-cloud-dependencies.version>
         <assertj.version>3.15.0</assertj.version>
         <openpojo.version>0.8.13</openpojo.version>
         <equalsverifier.version>1.7.5</equalsverifier.version>
@@ -67,8 +67,8 @@
         <nexus-staging-maven-plugin.version>1.6.3</nexus-staging-maven-plugin.version>
         <maven-source-plugin.version>2.2.1</maven-source-plugin.version>
         <maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
-        <maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version>
-        <maven-failsaife-plugin.version>2.20.1</maven-failsaife-plugin.version>
+        <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
+        <maven-failsaife-plugin.version>2.22.1</maven-failsaife-plugin.version>
         <maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
         <asciidoctor.version>1.5.2</asciidoctor.version>
         <!-- jacoco -->
diff --git a/spring-batch-lightmin-client/spring-batch-lightmin-client-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/configuration/LightminClientProperties.java b/spring-batch-lightmin-client/spring-batch-lightmin-client-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/configuration/LightminClientProperties.java
index 131ff9cc9..6ccf38c76 100644
--- a/spring-batch-lightmin-client/spring-batch-lightmin-client-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/configuration/LightminClientProperties.java
+++ b/spring-batch-lightmin-client/spring-batch-lightmin-client-core/src/main/java/org/tuxdevelop/spring/batch/lightmin/client/configuration/LightminClientProperties.java
@@ -91,7 +91,7 @@ public String getManagementUrl() {
                 resultManagementUrl =
                         this.append(
                                 this.append(this.getServiceUrl(),
-                                        this.managementServerProperties.getServlet().getContextPath()),
+                                        this.managementServerProperties.getBasePath()),
                                 this.webEndpointProperties.getBasePath());
             } else {
                 if (this.managementPort == null) {
@@ -103,13 +103,13 @@ public String getManagementUrl() {
                         final String hostAddress = this.getHostAddress(address);
                         resultManagementUrl = this.append(
                                 this.append(this.createLocalUri(hostAddress, this.managementPort),
-                                        this.managementServerProperties.getServlet().getContextPath()),
+                                        this.managementServerProperties.getBasePath()),
                                 this.webEndpointProperties.getBasePath());
 
                     } else {
                         resultManagementUrl = this.append(
                                 this.append(this.createLocalUri(this.determineHost(), this.managementPort),
-                                        this.managementServerProperties.getServlet().getContextPath()),
+                                        this.managementServerProperties.getBasePath()),
                                 this.webEndpointProperties.getBasePath());
                     }
                 }