diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/ApiDocController.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/ApiDocController.java
index 5799e40a..ee648936 100644
--- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/ApiDocController.java
+++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/ApiDocController.java
@@ -8,6 +8,6 @@ public class ApiDocController {
 
 	@GetMapping({ "/apidoc", "/api-doc", "/doc", "/swagger" })
 	public String apiDoc() {
-		return "redirect:swagger-ui.html";
+		return "redirect:swagger-ui/";
 	}
 }
diff --git a/apps/dhp-broker-application/src/main/resources/static/index.html b/apps/dhp-broker-application/src/main/resources/static/index.html
index 95040d04..43869a07 100644
--- a/apps/dhp-broker-application/src/main/resources/static/index.html
+++ b/apps/dhp-broker-application/src/main/resources/static/index.html
@@ -27,7 +27,7 @@
 						<a class="nav-link dropdown-toggle" href="javascript:void(0)" data-toggle="dropdown">Tools <span class="caret"></span></a>
 						<div class="dropdown-menu dropdown-menu-right">
 							<a class="dropdown-item" href="{{t.url}}" target="_blank" ng-repeat="t in tools">{{t.name}}</a>
-							<a class="dropdown-item" href="/swagger-ui.html" target="_blank">API documentation</a>
+							<a class="dropdown-item" href="/swagger-ui/" target="_blank">API documentation</a>
          				</div>
          			</li>
 				</ul>
diff --git a/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/oa/controllers/ApiDocController.java b/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/oa/controllers/ApiDocController.java
index e8095eee..6abe9b37 100644
--- a/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/oa/controllers/ApiDocController.java
+++ b/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/oa/controllers/ApiDocController.java
@@ -8,6 +8,6 @@ public class ApiDocController {
 
 	@GetMapping({ "/apidoc", "/api-doc", "/doc", "/swagger" })
 	public String apiDoc() {
-		return "redirect:swagger-ui.html";
+		return "redirect:swagger-ui/";
 	}
 }
diff --git a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/controller/SwaggerController.java b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/controller/SwaggerController.java
index 7f757719..3ec9dff8 100644
--- a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/controller/SwaggerController.java
+++ b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/controller/SwaggerController.java
@@ -11,6 +11,6 @@ public class SwaggerController {
 		"/apidoc", "/api-doc", "/doc", "/swagger"
 	}, method = RequestMethod.GET)
 	public String apiDoc() {
-		return "redirect:swagger-ui.html";
+		return "redirect:swagger-ui/";
 	}
 }
diff --git a/apps/dhp-mdstore-manager/src/main/resources/static/index.html b/apps/dhp-mdstore-manager/src/main/resources/static/index.html
index 77b44c37..f5727e98 100644
--- a/apps/dhp-mdstore-manager/src/main/resources/static/index.html
+++ b/apps/dhp-mdstore-manager/src/main/resources/static/index.html
@@ -20,7 +20,7 @@
 					<h1>Metadata Store Manager</h1>
 			
 					<hr />
-					<a href="./swagger-ui.html" target="_blank">API documentation</a>
+					<a href="./swagger-ui/" target="_blank">API documentation</a>
 					<hr />
 					<a href="javascript:void(0)" data-toggle="modal" data-target="#newMdstoreModal">create a new mdstore</a>
 					<hr />
diff --git a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/HomeController.java b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/HomeController.java
index f7a7ec14..3a48ac03 100644
--- a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/HomeController.java
+++ b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/HomeController.java
@@ -50,7 +50,7 @@ public class HomeController extends AbstractDnetController {
 		"/doc", "/swagger"
 	})
 	public String apiDoc() {
-		return "redirect:swagger-ui.html";
+		return "redirect:swagger-ui/";
 	}
 
 }
diff --git a/libs/dnet-apps-common/pom.xml b/libs/dnet-apps-common/pom.xml
index 6cd4953c..1e1388df 100644
--- a/libs/dnet-apps-common/pom.xml
+++ b/libs/dnet-apps-common/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<parent>
 		<groupId>eu.dnetlib.dhp</groupId>
@@ -23,7 +25,7 @@
 			<artifactId>javax.servlet-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		
+
 		<!-- for /metrics and /health controllers -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -41,12 +43,7 @@
 		<!-- Swagger -->
 		<dependency>
 			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger2</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger-ui</artifactId>
+			<artifactId>springfox-boot-starter</artifactId>
 		</dependency>
 
 		<!-- for /metrics and /health controllers -->
diff --git a/libs/dnet-apps-common/src/main/java/eu/dnetlib/common/app/AbstractDnetApp.java b/libs/dnet-apps-common/src/main/java/eu/dnetlib/common/app/AbstractDnetApp.java
index d138b998..7b03ce88 100644
--- a/libs/dnet-apps-common/src/main/java/eu/dnetlib/common/app/AbstractDnetApp.java
+++ b/libs/dnet-apps-common/src/main/java/eu/dnetlib/common/app/AbstractDnetApp.java
@@ -2,6 +2,7 @@ package eu.dnetlib.common.app;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.util.Arrays;
 
 import javax.annotation.PostConstruct;
 
@@ -14,8 +15,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.io.ClassPathResource;
 
-import com.google.common.collect.Lists;
-
 import io.micrometer.core.instrument.ImmutableTag;
 import io.micrometer.core.instrument.Metrics;
 import springfox.documentation.spi.DocumentationType;
@@ -40,7 +39,7 @@ public abstract class AbstractDnetApp {
 			final ImmutableTag tag2 = new ImmutableTag("version", model.getVersion());
 			final ImmutableTag tag3 = new ImmutableTag("scmtag", model.getScm().getTag());
 
-			Metrics.gauge("micrometer_info", Lists.newArrayList(tag1, tag2, tag3), 1);
+			Metrics.gauge("micrometer_info", Arrays.asList(tag1, tag2, tag3), 1);
 		} catch (IOException | XmlPullParserException e) {
 			log.error("Error registering metric", e);
 		}
diff --git a/libs/dnet-broker-apps-common/pom.xml b/libs/dnet-broker-apps-common/pom.xml
index c4f91eb3..4ca2e69a 100644
--- a/libs/dnet-broker-apps-common/pom.xml
+++ b/libs/dnet-broker-apps-common/pom.xml
@@ -67,13 +67,7 @@
 		<!-- Swagger -->
 		<dependency>
 			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger2</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger-ui</artifactId>
+			<artifactId>springfox-boot-starter</artifactId>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/pom.xml b/pom.xml
index a15c4908..883efbcd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -101,7 +103,11 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.10</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
 		</dependency>
 
 		<dependency>
@@ -136,6 +142,11 @@
 
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>com.google.guava</groupId>
+				<artifactId>guava</artifactId>
+				<version>30.1.1-jre</version>
+			</dependency>
 
 			<dependency>
 				<groupId>eu.dnetlib.dhp</groupId>
@@ -146,18 +157,13 @@
 						<groupId>com.google.guava</groupId>
 						<artifactId>guava</artifactId>
 					</exclusion>
-				</exclusions> 
+				</exclusions>
 			</dependency>
 
 			<dependency>
 				<groupId>commons-cli</groupId>
 				<artifactId>commons-cli</artifactId>
-				<version>1.4</version>	
-			</dependency>
-
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-lang3</artifactId>
+				<version>1.4</version>
 			</dependency>
 
 			<dependency>
@@ -169,7 +175,7 @@
 			<dependency>
 				<groupId>commons-io</groupId>
 				<artifactId>commons-io</artifactId>
-				<version>2.4</version>
+				<version>2.10.0</version>
 			</dependency>
 
 			<dependency>
@@ -219,14 +225,8 @@
 			<!-- Swagger -->
 			<dependency>
 				<groupId>io.springfox</groupId>
-				<artifactId>springfox-swagger2</artifactId>
-				<version>2.9.2</version>
-			</dependency>
-
-			<dependency>
-				<groupId>io.springfox</groupId>
-				<artifactId>springfox-swagger-ui</artifactId>
-				<version>2.9.2</version>
+				<artifactId>springfox-boot-starter</artifactId>
+				<version>3.0.0</version>
 			</dependency>
 			
 			<!-- Hadoop -->