diff --git a/pom.xml b/pom.xml
index d339847..ebced44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,11 +6,11 @@
         <artifactId>uoa-spring-boot-parent</artifactId>
         <version>1.0.0</version>
     </parent>
-    <artifactId>login-service</artifactId>
-    <version>1.0.6-BETA-SNAPSHOT</version>
+    <artifactId>egi-login-service</artifactId>
+    <version>1.0.6-SNAPSHOT</version>
     <packaging>war</packaging>
-    <name>login-service</name>
-    <description>login-service</description>
+    <name>egi-login-service</name>
+    <description>egi-login-service</description>
     <scm>
         <developerConnection>scm:git:gitea@code-repo.d4science.org:MaDgIK/login-service.git</developerConnection>
         <tag>HEAD</tag>
diff --git a/src/main/resources/authentication.properties b/src/main/resources/authentication.properties
index 07868b3..49cca20 100644
--- a/src/main/resources/authentication.properties
+++ b/src/main/resources/authentication.properties
@@ -1,19 +1,21 @@
 authentication.domain=di.uoa.gr
 
-authentication.keycloak=false
-authentication.oidc.issuer=https://aai.openaire.eu/oidc/
-authentication.oidc.logout=https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=
-authentication.oidc.home=http://mpagasas.di.uoa.gr:19080/login-service/openid_connect_login
-authentication.oidc.scope=openid,profile,email,eduperson_entitlement
-authentication.oidc.id=id
-authentication.oidc.secret=secret
+#keycloak
+authentication.keycloak=true
+authentication.oidc.issuer=https://aai-dev.egi.eu/auth/realms/egi
+authentication.oidc.logout=https://aai-dev.egi.eu/auth/realms/egi/protocol/openid-connect/logout
 
-authentication.session=openAIRESession
-authentication.accessToken=AccessToken
-authentication.redirect=http://mpagasas.di.uoa.gr:4600/reload
+authentication.oidc.home=http://rudie.di.uoa.gr:8580/openid_connect_login
+authentication.oidc.scope=openid,profile,email,eduperson_entitlement,eduperson_scoped_affiliation,eduperson_unique_id,offline_access
+authentication.oidc.id=a8ec6e5c-7bee-46aa-9a6f-18baca923582
+authentication.oidc.secret=2A91F53A1551AC33
 
+authentication.session=EGISession
+authentication.accessToken=EGIAccessToken
+
+authentication.redirect=http://scoobydoo.di.uoa.gr:4000/reload
 # Currently, this is the only available mapper, set to null or anything else will ignore this.
-authentication.authorities-mapper=openAIREMapper
+authentication.authorities-mapper=null
 
 ## API Documentation Properties
 api.title = Login Service
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index ff41fc8..78d44cc 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -7,8 +7,8 @@
     </Properties>
     <Appenders>
         <!-- Rolling File Appender -->
-        <RollingFile name="R" fileName="/var/log/dnet/login-service/login-service.log"
-                     filePattern="/var/log/dnet/login-service/login-service-%d{yyyy-MM-dd}-%i.log">
+        <RollingFile name="R" fileName="/var/log/dnet/egi-login-service/egi-login-service.log"
+                     filePattern="/var/log/dnet/egi-login-service/egi-login-service-%d{yyyy-MM-dd}-%i.log">
             <PatternLayout>
                 <Pattern>${LOG_PATTERN}</Pattern>
             </PatternLayout>
@@ -17,8 +17,8 @@
             </Policies>
             <DefaultRolloverStrategy max="10"/>
         </RollingFile>
-        <RollingFile name="S" fileName="/var/log/dnet/login-service/login-service-spring.log"
-                     filePattern="/var/log/dnet/login-service/login-service-spring-%d{yyyy-MM-dd}-%i.log">
+        <RollingFile name="S" fileName="/var/log/dnet/egi-login-service/egi-login-service-spring.log"
+                     filePattern="/var/log/dnet/egi-login-service/egi-login-service-spring-%d{yyyy-MM-dd}-%i.log">
             <PatternLayout>
                 <Pattern>${LOG_PATTERN}</Pattern>
             </PatternLayout>