diff --git a/pom.xml b/pom.xml
index a2684aa..1dcaa18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
+        <timestamp>${maven.build.timestamp}</timestamp>
+        <maven.build.timestamp.format>E MMM dd HH:mm:ss z yyyy</maven.build.timestamp.format>
     </properties>
 
     <dependencies>
@@ -112,5 +114,11 @@
             </plugin>
         </plugins>
         <finalName>uoa-monitor-service</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
     </build>
 </project>
\ No newline at end of file
diff --git a/src/main/java/eu/dnetlib/uoamonitorservice/UoaMonitorServiceApplication.java b/src/main/java/eu/dnetlib/uoamonitorservice/UoaMonitorServiceApplication.java
index dbdfb10..1233a02 100644
--- a/src/main/java/eu/dnetlib/uoamonitorservice/UoaMonitorServiceApplication.java
+++ b/src/main/java/eu/dnetlib/uoamonitorservice/UoaMonitorServiceApplication.java
@@ -1,6 +1,7 @@
 package eu.dnetlib.uoamonitorservice;
 
 import eu.dnetlib.uoaauthorizationlibrary.configuration.AuthorizationConfiguration;
+import eu.dnetlib.uoamonitorservice.configuration.GlobalVars;
 import eu.dnetlib.uoamonitorservice.configuration.properties.MongoConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -14,17 +15,18 @@ import org.springframework.context.annotation.PropertySources;
 })
 @PropertySources({
         @PropertySource("classpath:authorization.properties"),
+        @PropertySource("classpath:admintoolslibrary.properties"),
+        @PropertySource("classpath:notification.properties"),
         @PropertySource("classpath:monitorservice.properties"),
         @PropertySource(value = "classpath:dnet-override.properties", ignoreResourceNotFound = true)
 })
 
 //SecurityConfig.class,
-@EnableConfigurationProperties({ MongoConfig.class})
+@EnableConfigurationProperties({ MongoConfig.class, GlobalVars.class})
 
 @Import(AuthorizationConfiguration.class)
 public class UoaMonitorServiceApplication {
     public static void main(String[] args) {
         SpringApplication.run(UoaMonitorServiceApplication.class, args);
     }
-
 }
diff --git a/src/main/java/eu/dnetlib/uoamonitorservice/configuration/GlobalVars.java b/src/main/java/eu/dnetlib/uoamonitorservice/configuration/GlobalVars.java
new file mode 100644
index 0000000..8527e47
--- /dev/null
+++ b/src/main/java/eu/dnetlib/uoamonitorservice/configuration/GlobalVars.java
@@ -0,0 +1,22 @@
+package eu.dnetlib.uoamonitorservice.configuration;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import java.util.Date;
+
+@ConfigurationProperties("monitorservice.globalVars")
+public class GlobalVars {
+    public static Date date = new Date();
+    private Date buildDate;
+
+    public String getBuildDate() {
+        if(buildDate == null) {
+            return null;
+        }
+        return buildDate.toString();
+    }
+
+    public void setBuildDate(Date buildDate) {
+        this.buildDate = buildDate;
+    }
+}
diff --git a/src/main/java/eu/dnetlib/uoamonitorservice/controllers/MonitorServiceCheckDeployController.java b/src/main/java/eu/dnetlib/uoamonitorservice/controllers/MonitorServiceCheckDeployController.java
index 260e43e..87434a4 100644
--- a/src/main/java/eu/dnetlib/uoamonitorservice/controllers/MonitorServiceCheckDeployController.java
+++ b/src/main/java/eu/dnetlib/uoamonitorservice/controllers/MonitorServiceCheckDeployController.java
@@ -3,6 +3,7 @@ package eu.dnetlib.uoamonitorservice.controllers;
 import com.mongodb.BasicDBObject;
 import com.mongodb.CommandResult;
 import com.mongodb.DBObject;
+import eu.dnetlib.uoamonitorservice.configuration.GlobalVars;
 import eu.dnetlib.uoamonitorservice.configuration.mongo.MongoConnection;
 import eu.dnetlib.uoamonitorservice.configuration.properties.MongoConfig;
 import org.apache.log4j.Logger;
@@ -29,6 +30,9 @@ public class MonitorServiceCheckDeployController {
     @Autowired
     private MongoConfig mongoConfig;
 
+    @Autowired
+    private GlobalVars globalVars;
+
     @RequestMapping(value = {"", "/health_check"}, method = RequestMethod.GET)
     public String hello() {
         log.debug("Hello from uoa-monitor-service!");
@@ -56,7 +60,12 @@ public class MonitorServiceCheckDeployController {
         response.put("monitorservice.mongodb.password", mongoConfig.getPassword() == null ? null : "[unexposed value]");
 //        response.put("Define also", "monitorservice.mongodb.username, monitorservice.mongodb.password");
 
-        response.put("Date of build", new Date().toString());
+        if(globalVars.date != null) {
+            response.put("Date of deploy", globalVars.date.toString());
+        }
+        if(globalVars.getBuildDate() != null) {
+            response.put("Date of build", globalVars.getBuildDate());
+        }
 
         return response;
     }
diff --git a/src/main/resources/monitorservice.properties b/src/main/resources/monitorservice.properties
index bc1f981..9559fdd 100644
--- a/src/main/resources/monitorservice.properties
+++ b/src/main/resources/monitorservice.properties
@@ -8,6 +8,7 @@ monitorservice.password = ...
 monitorservice.mongodb.host=localhost
 monitorservice.mongodb.port=27017
 monitorservice.mongodb.database=openaire_monitor3
+monitorservice.globalVars.buildDate=@timestamp@
 
 #beta
 #monitorservice.userInfoUrl =  https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=
diff --git a/update_db.js b/update_db.js
index dd4bca8..459a080 100644
--- a/update_db.js
+++ b/update_db.js
@@ -309,7 +309,7 @@ use monitordb;
 //
 // uniqueIndexes();
 
-// 04-06-2021
+// 04-06-2021 - 24-06-2021
 addHomePageInPortalType("funder");
 addFooterDivIdForPortalType("funder");
 addFooterHelpTextForPortalType("funder");