diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index fe0a5549..a31d0fe1 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -206,7 +206,10 @@ class eidas_connector {
       ports    => ['443:8443'],
       volumes  => ['/var/log/eidas-connector:/var/log/eidas-connector',
                    '/etc/eidas-connector:/etc/eidas-connector'],
-      env      => ["IDP_SERVER_HOSTNAME=$hostname","IDP_FTICKS_SALT=$idp_fticks_salt"]
+      env      => ["IDP_SERVER_HOSTNAME=$hostname",
+                   "IDP_ENTITY_ID=https://$hostname/eidas",
+                   "SP_ENTITY_ID=https://$hostname/idp/metadata/sp",
+                   "IDP_FTICKS_SALT=$idp_fticks_salt"]
    } ->
    class {'webserver': } ->
    class {'https_server': }