diff --git a/src/main/java/eu/dnetlib/repo/manager/config/DatasourceConfiguration.java b/src/main/java/eu/dnetlib/repo/manager/config/DatasourceConfiguration.java
index 1b0c95b..09a38a8 100644
--- a/src/main/java/eu/dnetlib/repo/manager/config/DatasourceConfiguration.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/DatasourceConfiguration.java
@@ -14,16 +14,16 @@ public class DatasourceConfiguration {
 
     private static Logger LOGGER = Logger.getLogger(DatasourceConfiguration.class);
 
-    @Value("${repomanager.db.driverClassName}")
+    @Value("${services.repomanager.db.driverClassName}")
     private String driverClassname;
 
-    @Value("${repomanager.db.url}")
+    @Value("${services.repomanager.db.url}")
     private String URL;
 
-    @Value("${repomanager.db.username}")
+    @Value("${services.repomanager.db.username}")
     private String username;
 
-    @Value("${repomanager.db.password}")
+    @Value("${services.repomanager.db.password}")
     private String password;
 
     @Bean
diff --git a/src/main/java/eu/dnetlib/repo/manager/config/MailConfig.java b/src/main/java/eu/dnetlib/repo/manager/config/MailConfig.java
index d170f19..560d2b6 100644
--- a/src/main/java/eu/dnetlib/repo/manager/config/MailConfig.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/MailConfig.java
@@ -8,31 +8,31 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public class MailConfig {
 
-    @Value("${services.validator.mail.host}")
+    @Value("${services.repomanager.mail.host}")
     private String host;
 
-    @Value("${services.validator.mail.port}")
+    @Value("${services.repomanager.mail.port}")
     private int port;
 
-    @Value("${services.validator.mail.authenticate}")
+    @Value("${services.repomanager.mail.authenticate}")
     private boolean authenticate;
 
-    @Value("${services.validator.mail.username}")
+    @Value("${services.repomanager.mail.username}")
     private String username;
 
-    @Value("${services.validator.mail.password}")
+    @Value("${services.repomanager.mail.password}")
     private String password;
 
-    @Value("${services.validator.mail.from}")
+    @Value("${services.repomanager.mail.from}")
     private String from;
 
-    @Value("${services.validator.mail.replyTo}")
+    @Value("${services.repomanager.mail.replyTo}")
     private String replyTo;
 
-    @Value("${services.validator.mail.mode}")
+    @Value("${services.repomanager.mail.mode}")
     private String mode;
 
-    @Value("${services.validator.mail.debug}")
+    @Value("${services.repomanager.mail.debug}")
     private boolean debug;
 
     @Bean
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 7390b5e..1cfdbf7 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -11,44 +11,35 @@ container.port = 8080
 #container.context = <yourContext>
 
 # BASIC SETTINGS
-services.validator.mode.user = ldap
-services.validator.mail.override = false
-services.validator.mode.repo = dms
-services.validator.baseUrl = http://${container.hostname}:${container.port}/${container.context}
-services.validator.dnetWorkflow = true
-services.validator.deploy.environment = openaire-beta
-#services.validator.deploy.environment = mincyt
-services.validator.registration.files.download = true
-services.validator.autoRestoreOnStartup = false
-services.validator.mode.standalone = false
-services.validator.mail.override = false
-services.validator.adminEmail = antleb@di.uoa.gr
-services.validator.admins.master = antleb@di.uoa.gr
-services.validator.admins.secondary = ant.lebesis@gmail.com
-services.validator.adminBaseUrl = ../validator-admin
-services.validator.webBaseUrl = http://${container.hostname}:${container.port}/validator
-services.validator.registrationsReport.email = ant.lebesis@gmail.com
-services.repo-manager.repository.testing.mode = false
+#services.validator.mode.user = ldap
+#services.validator.mail.override = false
+#services.validator.mode.repo = dms
+#services.validator.baseUrl = http://${container.hostname}:${container.port}/${container.context}
+#services.validator.dnetWorkflow = true
+#services.validator.deploy.environment = openaire-beta
+##services.validator.deploy.environment = mincyt
+#services.validator.registration.files.download = true
+#services.validator.autoRestoreOnStartup = false
+#services.validator.mode.standalone = false
+#services.validator.mail.override = false
+#services.validator.adminEmail = antleb@di.uoa.gr
+#services.validator.admins.master = antleb@di.uoa.gr
+#services.validator.admins.secondary = ant.lebesis@gmail.com
+#services.validator.adminBaseUrl = ../validator-admin
+#services.validator.webBaseUrl = http://${container.hostname}:${container.port}/validator
+#services.validator.registrationsReport.email = ant.lebesis@gmail.com
+#services.repo-manager.repository.testing.mode = false
 
 # EMAIL SETTINGS
-services.validator.mail.host = smtp.gmail.com
-services.validator.mail.port = 465
-services.validator.mail.username = test.openaire@gmail.com
-services.validator.mail.password = ^($*@$)*!$
-services.validator.mail.authenticate = true
-services.validator.mail.mode = ssl
-ervices.validator.mail.fromAddress = no-reply@mpagasas.openaire.eu
-services.validator.mail.override = false
-services.validator.mail.overrideEmail = nikonas@di.uoa.gr
-services.validator.mail.specialRecipients = antleb@di.uoa.gr
-
-
-# VALIDATOR DB
-services.validator.db.driverClassName = org.postgresql.Driver
-#services.validator.db.url = jdbc:postgresql://194.177.192.119:5432/validator
-services.validator.db.url = jdbc:postgresql://88.197.53.70:5432/validator
-services.validator.db.username = dnet
-services.validator.db.password = dnetPwd
+services.repomanager.mail.host = smtp.gmail.com
+services.repomanager.mail.port = 465
+services.repomanager.mail.username = test.openaire@gmail.com
+services.repomanager.mail.password = ^($*@$)*!$
+services.repomanager.mail.authenticate = true
+services.repomanager.mail.debug = false
+services.repomanager.mail.mode = ssl
+services.repomanager.mail.from = test.openaire@gmail.com
+services.repomanager.mail.replyTo = test.openaire@gmail.com
 
 # IS
 #ISLookUpService.url = http://node1.t.openaire.research-infrastructures.eu:8280/is/services/isLookUp
@@ -91,18 +82,18 @@ ValidatorService.url=http://estella.athenarc.gr:8080/validator-service/services/
 #services.validator.ldap.username = cn=admin,dc=openaire,dc=eu
 #services.validator.ldap.password = serenata
 #services.validator.ldap.usersDN = ou=users,dc=openaire,dc=eu
-
-services.users.ldap.address = 194.177.192.119
-services.users.ldap.port = 389
-services.users.ldap.username = cn=admin,dc=openaire,dc=eu
-services.users.ldap.password = serenata
-services.users.ldap.usersDN = ou=users,dc=openaire,dc=eu
-
-services.validator.ldap.address = 194.177.192.119
-services.validator.ldap.port = 389
-services.validator.ldap.username = cn=admin,dc=openaire,dc=eu
-services.validator.ldap.password = serenata
-services.validator.ldap.usersDN = ou=users,dc=openaire,dc=eu
+#
+#services.users.ldap.address = 194.177.192.119
+#services.users.ldap.port = 389
+#services.users.ldap.username = cn=admin,dc=openaire,dc=eu
+#services.users.ldap.password = serenata
+#services.users.ldap.usersDN = ou=users,dc=openaire,dc=eu
+#
+#services.validator.ldap.address = 194.177.192.119
+#services.validator.ldap.port = 389
+#services.validator.ldap.username = cn=admin,dc=openaire,dc=eu
+#services.validator.ldap.password = serenata
+#services.validator.ldap.usersDN = ou=users,dc=openaire,dc=eu
 
 #AAI-REDIS
 redis.host = estella.athenarc.gr
@@ -112,28 +103,28 @@ redis.password = redis123
 oidc.dev.home = http://localhost:8480/uoa-repository-manager-service/openid_connect_login
 webapp.dev.front = http://localhost:4200/dashboard
 
-repomanager.db.driverClassName=org.postgresql.Driver
-repomanager.db.url=jdbc:postgresql://194.177.192.119:5432/repomanager
-repomanager.db.username=dnet
-repomanager.db.password=dnetPwd
-infrastructure.name=integration
+services.repomanager.db.driverClassName=org.postgresql.Driver
+services.repomanager.db.url=jdbc:postgresql://194.177.192.119:5432/repomanager
+services.repomanager.db.username=dnet
+services.repomanager.db.password=dnetPwd
+#infrastructure.name=integration
 
-transport.soap.baseAddress=http://${container.hostname}:${container.port}/${container.context}
-transport.soap.force.local.address=false
-services.validator.mail.host=smtp.gmail.com
-services.validator.mail.port=465
-services.validator.mail.fromAddress=no-reply@openaire.eu
-services.validator.mail.replyToAddress=no-reply@openaire.eu
-services.validator.mail.username=test.openaire@gmail.com
-services.validator.mail.password=^($*@$)*!$
-services.validator.mail.authenticate=true
-services.validator.mail.override=false
-services.validator.mail.logonly=false
-services.validator.mail.mode=ssl
-services.validator.mail.debug=false
-services.validator.mail.overrideEmail=antleb@di.uoa.gr
-services.validator.mail.specialRecipients=antleb@di.uoa.gr
-services.validator.repoRegistration.override=antleb@di.uoa.gr
+#transport.soap.baseAddress=http://${container.hostname}:${container.port}/${container.context}
+#transport.soap.force.local.address=false
+#services.validator.mail.host=smtp.gmail.com
+#services.validator.mail.port=465
+#services.validator.mail.fromAddress=no-reply@openaire.eu
+#services.validator.mail.replyToAddress=no-reply@openaire.eu
+#services.validator.mail.username=test.openaire@gmail.com
+#services.validator.mail.password=^($*@$)*!$
+#services.validator.mail.authenticate=true
+#services.validator.mail.override=false
+#services.validator.mail.logonly=false
+#services.validator.mail.mode=ssl
+#services.validator.mail.debug=false
+#services.validator.mail.overrideEmail=antleb@di.uoa.gr
+#services.validator.mail.specialRecipients=antleb@di.uoa.gr
+#services.validator.repoRegistration.override=antleb@di.uoa.gr
 
 oidc.issuer=https://aai.openaire.eu/oidc/
 oidc.id=767422b9-5461-4807-a80a-f9a2072d3a7d
diff --git a/src/main/webapp/WEB-INF/applicationContext.xml b/src/main/webapp/WEB-INF/applicationContext.xml
index f6cc74e..b744c56 100644
--- a/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/src/main/webapp/WEB-INF/applicationContext.xml
@@ -21,21 +21,6 @@
 
     <!--<import resource="classpath*:/gr/uoa/di/driver/app/springContext-registrator.xml"/>-->
 
-
-
-
-    <bean id="maillib" class="eu.dnetlib.utils.MailLibrary" init-method="init">
-        <property name="mailhost" value="${services.validator.mail.host}"/>
-        <property name="smtpPort" value="${services.validator.mail.port}"/>
-        <property name="authenticate" value="${services.validator.mail.authenticate}"/>
-        <property name="username" value="${services.validator.mail.username}"/>
-        <property name="password" value="${services.validator.mail.password}"/>
-        <property name="from" value="${services.validator.mail.fromAddress}"/>
-        <property name="replyTo" value="${services.validator.mail.replyToAddress}"/>
-        <property name="mode" value="${services.validator.mail.mode}"/>
-        <property name="debug" value="${services.validator.mail.debug}"/>
-    </bean>
-
     <bean class="eu.dnetlib.repo.manager.config.CascadingPropertyLoader"
           id="propertyLoader">
         <property name="order" value="2"/>