diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/LiteratureBrokerServiceConfiguration.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/LiteratureBrokerServiceConfiguration.java
index 65e98910..cffd489d 100644
--- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/LiteratureBrokerServiceConfiguration.java
+++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/LiteratureBrokerServiceConfiguration.java
@@ -34,9 +34,9 @@ import io.micrometer.core.instrument.ImmutableTag;
 import io.micrometer.core.instrument.Metrics;
 import io.prometheus.client.exporter.MetricsServlet;
 import io.prometheus.client.hotspot.DefaultExports;
+import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.RequestHandlerSelectors;
 import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.Contact;
 import springfox.documentation.service.Tag;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
@@ -106,16 +106,14 @@ public class LiteratureBrokerServiceConfiguration extends AbstractElasticsearchC
 			.build()
 			.tags(new Tag(TAG_EVENTS, "Events management"), new Tag(TAG_SUBSCRIPTIONS, "Subscriptions management"), new Tag(TAG_NOTIFICATIONS,
 				"Notifications management"), new Tag(TAG_TOPIC_TYPES, "Topic types management"), new Tag(TAG_OPENAIRE, "OpenAIRE use case"))
-			.apiInfo(new ApiInfo(
-				"Literature Broker Service",
-				"APIs documentation",
-				"1.1",
-				"urn:tos",
-
-				new Contact(null, null, null),
-				"Apache 2.0",
-				"http://www.apache.org/licenses/LICENSE-2.0", null));
-
+			.apiInfo(new ApiInfoBuilder()
+				.title("Literature Broker Service")
+				.description("APIs documentation")
+				.version("1.1")
+				.contact(ApiInfo.DEFAULT_CONTACT)
+				.license("Apache 2.0")
+				.licenseUrl("http://www.apache.org/licenses/LICENSE-2.0")
+				.build());
 	}
 
 	@Bean
diff --git a/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/BrokerConfiguration.java b/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/BrokerConfiguration.java
index c8adb86d..ac11f22d 100644
--- a/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/BrokerConfiguration.java
+++ b/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/BrokerConfiguration.java
@@ -34,9 +34,9 @@ import io.micrometer.core.instrument.ImmutableTag;
 import io.micrometer.core.instrument.Metrics;
 import io.prometheus.client.exporter.MetricsServlet;
 import io.prometheus.client.hotspot.DefaultExports;
+import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.RequestHandlerSelectors;
 import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.Contact;
 import springfox.documentation.service.Tag;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
@@ -100,14 +100,14 @@ public class BrokerConfiguration extends AbstractElasticsearchConfiguration {
 			.paths(p -> p.startsWith("/"))
 			.build()
 			.tags(new Tag(OA_PUBLIC_APIS, OA_PUBLIC_APIS))
-			.apiInfo(new ApiInfo(
-				"Literature Broker Service",
-				"APIs documentation",
-				"1.1",
-				"urn:tos",
-				new Contact(null, null, null),
-				"Apache 2.0",
-				"http://www.apache.org/licenses/LICENSE-2.0", null));
+			.apiInfo(new ApiInfoBuilder()
+				.title("OpenAIRE Public Broker API")
+				.description("APIs documentation")
+				.version("1.1")
+				.contact(ApiInfo.DEFAULT_CONTACT)
+				.license("Apache 2.0")
+				.licenseUrl("http://www.apache.org/licenses/LICENSE-2.0")
+				.build());
 
 	}