diff --git a/apps/bioschemas-api/src/main/resources/application.properties b/apps/bioschemas-api/src/main/resources/application.properties
index 5e88397b..57bf37a9 100644
--- a/apps/bioschemas-api/src/main/resources/application.properties
+++ b/apps/bioschemas-api/src/main/resources/application.properties
@@ -1,6 +1,9 @@
 server.servlet.context-path=/bioschemas-api
 server.port=8281
 
+server.public_url = http://localhost:8281/bioschemas-api
+server.public_desc = API Base URL
+
 spring.profiles.active=garr
 
 logging.file.name = /var/log/bioschemas-api/bioschemas.log
diff --git a/apps/dhp-broker-application/src/main/resources/application.properties b/apps/dhp-broker-application/src/main/resources/application.properties
index 8c2fb00a..76eed4de 100644
--- a/apps/dhp-broker-application/src/main/resources/application.properties
+++ b/apps/dhp-broker-application/src/main/resources/application.properties
@@ -1,5 +1,8 @@
 spring.profiles.active              = dev,openaire
 
+server.public_url = 
+server.public_desc = API Base URL
+
 #logging.level.root=DEBUG
 
 maven.pom.path = /META-INF/maven/eu.dnetlib.dhp/dhp-broker-application/effective-pom.xml
diff --git a/apps/dhp-broker-public-application/src/main/resources/application.properties b/apps/dhp-broker-public-application/src/main/resources/application.properties
index 0654f96c..e8cf0ad5 100644
--- a/apps/dhp-broker-public-application/src/main/resources/application.properties
+++ b/apps/dhp-broker-public-application/src/main/resources/application.properties
@@ -1,5 +1,8 @@
 spring.profiles.active              = dev,openaire
 
+server.public_url = 
+server.public_desc = API Base URL
+
 #logging.level.root=DEBUG
 
 maven.pom.path = /META-INF/maven/eu.dnetlib.dhp/dhp-broker-public-application/effective-pom.xml
diff --git a/apps/dhp-mdstore-manager/src/main/resources/application.properties b/apps/dhp-mdstore-manager/src/main/resources/application.properties
index 469d4ce9..5c1847a9 100644
--- a/apps/dhp-mdstore-manager/src/main/resources/application.properties
+++ b/apps/dhp-mdstore-manager/src/main/resources/application.properties
@@ -1,5 +1,8 @@
 spring.main.banner-mode = console
 
+server.public_url = 
+server.public_desc = API Base URL
+
 logging.level.root      = INFO
 
 maven.pom.path = /META-INF/maven/eu.dnetlib.dhp/dhp-mdstore-manager/effective-pom.xml
diff --git a/apps/dnet-exporter-api/src/main/resources/application.properties b/apps/dnet-exporter-api/src/main/resources/application.properties
index 2b947038..bde38f76 100644
--- a/apps/dnet-exporter-api/src/main/resources/application.properties
+++ b/apps/dnet-exporter-api/src/main/resources/application.properties
@@ -2,6 +2,9 @@
 server.servlet.context-path                 =   /openaire
 server.port                                 =   8080
 
+server.public_url = 
+server.public_desc = API Base URL
+
 spring.datasource.driverClassName           =   org.postgresql.Driver
 spring.jpa.database-platform                =   org.hibernate.dialect.PostgreSQL9Dialect
 spring.jpa.show-sql                         =   false
diff --git a/apps/dnet-orgs-database-application/src/main/resources/application.properties b/apps/dnet-orgs-database-application/src/main/resources/application.properties
index b063a3da..6425e130 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/application.properties
+++ b/apps/dnet-orgs-database-application/src/main/resources/application.properties
@@ -1,5 +1,8 @@
 server.port=8480
 
+server.public_url = http://localhost:8480
+server.public_desc = API Base URL
+
 spring.profiles.active=dev
 
 maven.pom.path = /META-INF/maven/eu.dnetlib.dhp/dnet-orgs-database-application/effective-pom.xml
diff --git a/apps/scholexplorer-api/src/main/resources/application.properties b/apps/scholexplorer-api/src/main/resources/application.properties
index ed836a81..60bb6bfc 100644
--- a/apps/scholexplorer-api/src/main/resources/application.properties
+++ b/apps/scholexplorer-api/src/main/resources/application.properties
@@ -1,5 +1,8 @@
 spring.main.banner-mode = console
 
+server.public_url = 
+server.public_desc = API Base URL
+
 logging.level.root      = INFO
 dhp.swagger.api.host = localhost:8080
 #dhp.swagger.api.host = api.scholexplorer.openaire.eu
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 5e8f5380..3ac65d41 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
@@ -19,9 +19,11 @@ import org.springframework.core.io.ClassPathResource;
 
 import io.micrometer.core.instrument.ImmutableTag;
 import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.util.StringUtils;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.info.License;
+import io.swagger.v3.oas.models.servers.Server;
 import io.swagger.v3.oas.models.tags.Tag;
 
 public abstract class AbstractDnetApp {
@@ -35,6 +37,12 @@ public abstract class AbstractDnetApp {
 	@Value("${maven.pom.path}")
 	private ClassPathResource pom;
 
+	@Value("${server.public_url}")
+	private String serverPublicUrl;
+
+	@Value("${server.public_desc}")
+	private String serverPublicDesc;
+
 	private static final Logger log = LoggerFactory.getLogger(AbstractDnetApp.class);
 
 	@PostConstruct
@@ -57,7 +65,16 @@ public abstract class AbstractDnetApp {
 
 	@Bean
 	public OpenAPI newSwaggerDocket() {
+		final List<Server> servers = new ArrayList<>();
+		if (StringUtils.isNotBlank(serverPublicUrl)) {
+			final Server server = new Server();
+			server.setUrl(serverPublicUrl);
+			server.setDescription(serverPublicDesc);
+			servers.add(server);
+		}
+
 		return new OpenAPI()
+			.servers(servers)
 			.info(getSwaggerInfo())
 			.tags(swaggerTags());
 	}