diff --git a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/MainApplication.java b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/MainApplication.java
index 1490364c..6a102e3e 100644
--- a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/MainApplication.java
+++ b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/MainApplication.java
@@ -1,5 +1,6 @@
 package eu.dnetlib.data.mdstore.manager;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
@@ -16,13 +17,22 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @EnableCaching
 public class MainApplication extends AbstractDnetApp {
 
+	@Value("${dhp.swagger.api.host}")
+	private String swaggetHost;
+
+	@Value("${dhp.swagger.api.basePath}")
+	private String swaggerPath;
+
 	public static void main(final String[] args) {
 		SpringApplication.run(MainApplication.class, args);
 	}
 
 	@Override
 	protected void configSwagger(final Docket docket) {
-		docket.select()
+		docket
+			.host(swaggetHost)
+			.pathMapping(swaggerPath)
+			.select()
 			.apis(RequestHandlerSelectors.any())
 			.paths(p -> p.startsWith("/mdstores"))
 			.build()
diff --git a/apps/dhp-mdstore-manager/src/main/resources/application.properties b/apps/dhp-mdstore-manager/src/main/resources/application.properties
index bd25907d..be6297cd 100644
--- a/apps/dhp-mdstore-manager/src/main/resources/application.properties
+++ b/apps/dhp-mdstore-manager/src/main/resources/application.properties
@@ -29,3 +29,6 @@ dhp.mdstore-manager.hdfs.base-path = /data/dnet.dev/mdstore
 dhp.mdstore-manager.hadoop.user    = dnet.dev
 
 dhp.mdstore-manager.inspector.records.max = 1000
+
+dhp.swagger.api.host = localhost
+dhp.swagger.api.basePath = /