diff --git a/.gitignore b/.gitignore
index 6aab11c55..79682d0c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ dmp-backend/src/main/ui-resources/static/inline.bundle.js
 dmp-backend/src/main/ui-resources/static/index.html
 dmp-backend/src/main/ui-resources/static/favicon.ico
 dmp-backend/src/main/ui-resources/static/assets/lang/en.json
+dmp-frontend/new  3.xml
diff --git a/dmp-admin/src/app/dataset-profile-form/form/form.component.html b/dmp-admin/src/app/dataset-profile-form/form/form.component.html
index e83634299..388ca31ce 100644
--- a/dmp-admin/src/app/dataset-profile-form/form/form.component.html
+++ b/dmp-admin/src/app/dataset-profile-form/form/form.component.html
@@ -70,5 +70,4 @@
             <button class="btn btn-primary" style="margin-top:20px;" type="submit" [disabled]="!form.valid">Save</button> 
         </form>
     </div>
-    <p>Form value: {{ form.value | json }}</p>
 </div>
\ No newline at end of file
diff --git a/dmp-admin/src/app/login/googgle-sign-in/googgle-sign-in.component.ts b/dmp-admin/src/app/login/googgle-sign-in/googgle-sign-in.component.ts
index dac20db7a..d98a5b343 100644
--- a/dmp-admin/src/app/login/googgle-sign-in/googgle-sign-in.component.ts
+++ b/dmp-admin/src/app/login/googgle-sign-in/googgle-sign-in.component.ts
@@ -23,7 +23,7 @@ export class GooggleSignInComponent implements OnInit, AfterViewInit {
   ngOnInit() {
   }
 
-  private clientId:string = '1010962018903-glegmqudqtl1lub0150vacopbu06lgsg.apps.googleusercontent.com';
+  private clientId:string = '524432312250-sc9qsmtmbvlv05r44onl6l93ia3k9deo.apps.googleusercontent.com';
   
   private scope = [
     'profile',
diff --git a/dmp-admin/src/app/login/main-sign-in/main-sign-in.component.html b/dmp-admin/src/app/login/main-sign-in/main-sign-in.component.html
index 660c3348b..c6a336722 100644
--- a/dmp-admin/src/app/login/main-sign-in/main-sign-in.component.html
+++ b/dmp-admin/src/app/login/main-sign-in/main-sign-in.component.html
@@ -3,7 +3,7 @@
     <div class="col-sm-6 col-md-4 col-md-offset-4">
       <h1 class="text-center login-title"></h1>
       <div class="account-wall">
-        <img class="profile-img" src="/assets/icons/user-icon.png">
+        <img class="profile-img" src="/admin-ui/assets/icons/user-icon.png">
         <form class="form-signin" [formGroup]="nativeLoginForm">
           <input type="text" class="form-control" [(ngModel)]="creds.username" formControlName="username" placeholder="Username or Email" required autofocus>
           <input type="password" class="form-control" [(ngModel)]="creds.password" formControlName="password" placeholder="Password" required>
diff --git a/dmp-admin/src/app/services/rest-base.ts b/dmp-admin/src/app/services/rest-base.ts
index 057c0e0bb..c5dc3e1f5 100644
--- a/dmp-admin/src/app/services/rest-base.ts
+++ b/dmp-admin/src/app/services/rest-base.ts
@@ -18,7 +18,7 @@ export class RestBase {
     /*
     */
     protocol: string = "http";
-    hostname: string = "192.168.32.96";
+    hostname: string = "dl043.madgik.di.uoa.gr";
     port: number = 8080;
     webappname: string = "";
     restpath: string = "";
diff --git a/dmp-admin/src/index.html b/dmp-admin/src/index.html
index 7f54dfa42..e6807fa45 100644
--- a/dmp-admin/src/index.html
+++ b/dmp-admin/src/index.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <title>DmpAdmin</title>
-  <base href="/">
+  <base href="/admin-ui/">
   <meta name="csrf-token" content="2c64def7de30197c40276fe1a7ea874ca8871f70be7d7dc3305465a4d5c565e4">
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
@@ -27,17 +27,17 @@
 
 
   <!-- XML to json and vice versa lib -->
-  <script src="assets/xml2json.min.js"></script>
+  <script src="/admin-ui/assets/xml2json.min.js"></script>
 
 	<!-- Json formatter lib -->
-	<link rel="stylesheet" type="text/css" href="assets/jquery.json-viewer.css">
-	<script src="assets/jquery.json-viewer.js"></script>
+	<link rel="stylesheet" type="text/css" href="/admin-ui/assets/jquery.json-viewer.css">
+	<script src="/admin-ui/assets/jquery.json-viewer.js"></script>
 	
 	<!-- lib 4 pretty-printing xml and json -->
-	<script src="assets/vkbeautify.0.99.00.js"></script>
+	<script src="/admin-ui/assets/vkbeautify.0.99.00.js"></script>
 	
 	<!-- Nice BS notifications -->
-	<script src="assets/bootstrap-notify.min.js"></script>
+	<script src="/admin-ui/assets/bootstrap-notify.min.js"></script>
 
   <!-- that's google sign in library -->
   <script src="https://apis.google.com/js/platform.js"></script>
@@ -47,8 +47,8 @@
 
 
   <!-- my custom global code and css --> 
-  <link rel="stylesheet" type="text/css" href="assets/custom.css">
-  <script src="assets/custom.js"></script>
+  <link rel="stylesheet" type="text/css" href="/admin-ui/assets/custom.css">
+  <script src="/admin-ui/assets/custom.js"></script>
 
 
   <link rel="icon" type="image/x-icon" href="favicon.ico">
diff --git a/dmp-backend/pom.xml b/dmp-backend/pom.xml
index de4496fa1..f5b7c114d 100644
--- a/dmp-backend/pom.xml
+++ b/dmp-backend/pom.xml
@@ -5,7 +5,7 @@
     <groupId>dmp-backend</groupId>
     <artifactId>dmp-backend</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <!--<packaging>war</packaging>-->
+    <packaging>war</packaging>
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
@@ -187,11 +187,11 @@
             <version>3.5</version>
         </dependency>
 
-        <!-- <dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
             <scope>provided</scope>
-        </dependency>-->
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java b/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java
index 42087b1a9..5e5dab495 100644
--- a/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java
+++ b/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java
@@ -18,10 +18,10 @@ import java.util.List;
 public class EuDatApplication extends SpringBootServletInitializer {
     private static final Logger logger = LoggerFactory.getLogger(EuDatApplication.class);
 
-    /*@Override
+    @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
         return builder.sources(EuDatApplication.class);
-    }*/
+    }
 
     public static void main(String[] args) {
         SpringApplication.run(EuDatApplication.class, args);
diff --git a/dmp-backend/src/main/java/eu/eudat/proxy/config/ConfigLoader.java b/dmp-backend/src/main/java/eu/eudat/proxy/config/ConfigLoader.java
index 16e8e64c3..bd83db9ae 100644
--- a/dmp-backend/src/main/java/eu/eudat/proxy/config/ConfigLoader.java
+++ b/dmp-backend/src/main/java/eu/eudat/proxy/config/ConfigLoader.java
@@ -34,9 +34,12 @@ public class ConfigLoader {
 
 				JAXBContext jaxbContext = JAXBContext.newInstance(ExternalUrls.class);
 				Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
-				is = new URL("file:///C:/Users/ikalyvas/Documents/Projects/OpenAIRE-EUDAT-DMP-service-pilot/dmp-backend/src/main/resources/ExternalUrls.xml").openStream();
+				is = new URL("file:///"+System.getenv("CATALINA_HOME")+fileUrl).openStream();
+				//is = new URL("file:///C:/Users/ikalyvas/Documents/Projects/OpenAIRE-EUDAT-DMP-service-pilot/dmp-backend/src/main/resources/ExternalUrls.xml").openStream();
 				externalUrls = (ExternalUrls) jaxbUnmarshaller.unmarshal(is);
+//			System.out.println(new ObjectMapper().writeValueAsString(externalUrls));
 			} catch (Exception ex) {
+				//log the error and shutdown the system (that's a critical error)
 				ex.printStackTrace();
 				System.out.println("Cannot find in folder"+current);
 			} finally {
diff --git a/dmp-backend/src/main/resources/application.properties b/dmp-backend/src/main/resources/application.properties
index 3a4a39eee..515bb3086 100644
--- a/dmp-backend/src/main/resources/application.properties
+++ b/dmp-backend/src/main/resources/application.properties
@@ -37,11 +37,11 @@ google.login.clientId=524432312250-sc9qsmtmbvlv05r44onl6l93ia3k9deo.apps.googleu
 ########################LINKEDIN LOGIN Properties#############################HiR4hQH9HNubKC5iKQy0l4mAZ
 linkedin.login.clientId=86bl8vfk77clh9
 linkedin.login.clientSecret=2OCO9e3wKylW05Tt
-linkedin.login.redirect_uri=http://dl043.madgik.di.uoa.gr/dmp/login/linkedin
+linkedin.login.redirect_uri=http://dl043.madgik.di.uoa.gr:8080/login/linkedin
 ########################LINKEDIN LOGIN Properties#############################
 twitter.login.clientId=HiR4hQH9HNubKC5iKQy0l4mAZ
 twitter.login.clientSecret=9KZHgkqUO2QFnELSL14jeUvfUacWX23rqD8OW8X0xoRDXOSfKH
-twitter.login.redirect_uri=http://dl043.madgik.di.uoa.gr/dmp/login/twitter
+twitter.login.redirect_uri=http://dl043.madgik.di.uoa.gr:8080/login/twitter
 ########################Persistence/Hibernate/Batch##############################
 #persistence.hibernate.jdbc.batch_size = 30
 #persistence.hibernate.order_inserts = true
diff --git a/dmp-frontend/src/app/app.constants.ts b/dmp-frontend/src/app/app.constants.ts
index 2387d782e..218244444 100644
--- a/dmp-frontend/src/app/app.constants.ts
+++ b/dmp-frontend/src/app/app.constants.ts
@@ -1,6 +1,6 @@
 export const HostConfiguration = {
-	Server: 'http://192.168.32.73:8080/',
-	App: 'http://localhost:4200/'
+	Server: 'http://dl043.madgik.di.uoa.gr:8080/',
+	App: 'http://dl043.madgik.di.uoa.gr:8080/'
 	//CASHost: 'https://login-devel.uoa.gr/login',
 	//Service: 'http://elkefinman/login'
 }
\ No newline at end of file
diff --git a/dmp-frontend/src/environments/environment.ts b/dmp-frontend/src/environments/environment.ts
index b7f639aec..4f0114ac4 100644
--- a/dmp-frontend/src/environments/environment.ts
+++ b/dmp-frontend/src/environments/environment.ts
@@ -4,5 +4,5 @@
 // The list of which env maps to which file can be found in `.angular-cli.json`.
 
 export const environment = {
-  production: false
+  production: true
 };
