diff --git a/src/main/java/eu/dnetlib/dnetexploremetrics/service/MetricsService.java b/src/main/java/eu/dnetlib/dnetexploremetrics/service/MetricsService.java
index fb8bfa0..7ed7706 100644
--- a/src/main/java/eu/dnetlib/dnetexploremetrics/service/MetricsService.java
+++ b/src/main/java/eu/dnetlib/dnetexploremetrics/service/MetricsService.java
@@ -46,6 +46,7 @@ public class MetricsService {
     @Scheduled(cron = "0 0 0 * * ?")
     private void calculateMetrics() {
         logger.info("Calculating metrics...");
+        System.out.println("Calculating metrics...");
         Metrics metrics = new Metrics();
         RestTemplate restTemplate  = new RestTemplate();
 
diff --git a/src/main/java/eu/dnetlib/dnetexploremetrics/utils/PrometheusMetricsFormatter.java b/src/main/java/eu/dnetlib/dnetexploremetrics/utils/PrometheusMetricsFormatter.java
index 73cd54e..7cc7a3f 100644
--- a/src/main/java/eu/dnetlib/dnetexploremetrics/utils/PrometheusMetricsFormatter.java
+++ b/src/main/java/eu/dnetlib/dnetexploremetrics/utils/PrometheusMetricsFormatter.java
@@ -8,13 +8,13 @@ public class PrometheusMetricsFormatter {
     private enum PrometheusMetrics {
         RECORDS("# TYPE explore_total_records gauge\nexplore_total_records %s"),
         PUBLICATIONS("# TYPE explore_records gauge\nexplore_records{type=\"publications\"} %s"),
-        DATASETS("# TYPE explore_total_datasets gauge\nexplore_records{type=\"datasets\"} %s"),
-        SOFTWARE("# TYPE explore_total_software gauge\nexplore_records{type=\"explore_total_software\"} %s"),
-        ORP("# TYPE explore_total_otherresearchproducts gauge\nexplore_records{type=\"otherresearchproducts\"} %s"),
+        DATASETS("explore_records{type=\"datasets\"} %s"),
+        SOFTWARE("explore_records{type=\"software\"} %s"),
+        ORP("explore_records{type=\"otherresearchproducts\"} %s"),
         FUNDERS("# TYPE explore_total_funders gauge\nexplore_total_funders %s"),
-        PROJECTS("#TYPE explore_total_projects gauge\nexplore_total_projects %s"),
-        CONTENT_PROVIDERS("#TYPE explore_total_contentproviders gauge\nexplore_total_contentproviders %s"),
-        ORGANIZATIONS("#TYPE explore_total_organizations gauge \nexplore_total_organizations %s");
+        PROJECTS("# TYPE explore_total_projects gauge\nexplore_total_projects %s"),
+        CONTENT_PROVIDERS("# TYPE explore_total_contentproviders gauge\nexplore_total_contentproviders %s"),
+        ORGANIZATIONS("# TYPE explore_total_organizations gauge \nexplore_total_organizations %s");
 
         private String value;
         PrometheusMetrics(String value) {