diff --git a/src/main/java/eu/dnetlib/dnetrolemanagement/config/security/SwaggerConfig.java b/src/main/java/eu/dnetlib/dnetrolemanagement/config/security/SwaggerConfig.java
index 7e3e2b9..6861b92 100644
--- a/src/main/java/eu/dnetlib/dnetrolemanagement/config/security/SwaggerConfig.java
+++ b/src/main/java/eu/dnetlib/dnetrolemanagement/config/security/SwaggerConfig.java
@@ -27,6 +27,7 @@ import java.util.List;
  * Swagger configuration class
  */
 @Configuration
+@Profile({"swagger"})
 @EnableSwagger2
 public class SwaggerConfig {
 
diff --git a/src/main/resources/registry.properties b/src/main/resources/registry.properties
index cd62565..47ccb34 100644
--- a/src/main/resources/registry.properties
+++ b/src/main/resources/registry.properties
@@ -4,7 +4,6 @@ registry.issuer=https://openaire-dev.aai-dev.grnet.gr/registry/
 registry.user=user
 registry.password=pass
 registry.version=1.0
-server.port=8090
 ## Redis Properties
 redis.host = localhost
 redis.port = 6379