diff --git a/roles/webui/defaults/main.yml b/roles/webui/defaults/main.yml
index 5fa21606f0f1d41c73ac067c5ae35b3d5c4a8fb6..8c33d054ebbf916beaa265cc9c40e5139f874eba 100644
--- a/roles/webui/defaults/main.yml
+++ b/roles/webui/defaults/main.yml
@@ -4,6 +4,7 @@ services:
   - http
   - https
 
+tenant_name: einfraname
 lavoisier_home: /var/www/lavoisier
 branch_name: master
 argo_web: argo-egi-web
diff --git a/roles/webui/templates/argo-config.properties.j2 b/roles/webui/templates/argo-config.properties.j2
index 1dc53516cdc7cfb3b30d2840874e875cbf66914b..c6b3ca23b48a735c8cdaa40e327c23faa416f84c 100644
--- a/roles/webui/templates/argo-config.properties.j2
+++ b/roles/webui/templates/argo-config.properties.j2
@@ -1,11 +1,7 @@
 ############################################
-# Okeanos API methods
+# ARGO API methods
 ###########################################
 
-
-# Base.Prod.Api=https://{{ argo_api_host }}/api/v1/
-# Base.Test.Api=https://{{ argo_api_host }}/api/v2/
-
 ### Generic Url Availability
 
 api.group.availability=https://{{ argo_api_host }}/api/v2/results/
@@ -26,6 +22,9 @@ api.custom.factors=https://{{ argo_api_host }}/api/v2/factors
 api.recomputation.url=https://{{ argo_api_host }}/api/v2/recalculate
 api.recomputation.history.url=https://{{ argo_api_host }}/api/v2/get_recalculation_requests
 
+### METRICS PROFILE
+api.metrics.profile=https://{{ argo_api_host }}/api/v2/metric_profiles
+
 ### PROFILES
 
 api.availabilities.profiles=http://argo.egi.eu/lavoisier/listProfilesRaw?accept=xml
@@ -48,6 +47,9 @@ api.monthly.sites.argo.cloud=https://{{ argo_api_host }}/api/v2/group_availabili
 # GOC DB
 ######################
 
+{% if tenant_name is defined and tenant_name|lower == "eudat" %}
+goc.siteProjects=https://{{ gocdb_endpoint }}/gocdbpi/private/?method=get_service_group
+{% endif %}
 goc.siteList=https://{{ gocdb_endpoint }}/gocdbpi/private/?method=get_site&certification_status={{ gocdb_certification }}&production_status={{ gocdb_production }}
 goc.ngiContactsList=https://{{ gocdb_endpoint }}/gocdbpi/private/?method=get_roc_contacts
 goc.serviceFlavours=https://{{ gocdb_endpoint }}/gocdbpi/public/?method=get_service_types