diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 9b4da8be..a687264b 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -225,6 +225,7 @@ class eidas_connector($version="1.0.6") {
 
 class eidas_proxy($version='1.0.0') {
    $_version = safe_hiera('eidas_proxy_version',$version)
+   $hostname = $::fqdn
    $hostname = safe_hiera('eidas_proxy_hostname');
    $country = safe_hiera('eidas_proxy_country');
    $proxy_service_cookie_encrypt_pw = safe_hiera('proxy_service_cookie_encrypt_pw',NOT_SET);
@@ -237,12 +238,14 @@ class eidas_proxy($version='1.0.0') {
       image    => 'docker.sunet.se/eidas-proxy',
       imagetag => $_version,
       ports    => ['443:8443'],
+      hostname => "$hostname",
       volumes  => ['/var/log/eidas-proxy:/var/log/eidas-proxy',
                    '/etc/eidas-proxy:/etc/eidas-proxy',
                    '/etc/ssl:/etc/ssl'],
       env      => ["PROXY_SERVICE_PATH_PREFIX=/etc/eidas-proxy/$country",
                    "PROXY_SERVICE_DOMAIN_PREFIX=https://$hostname/eidas-ps",
                    "SPRING_PROFILES_ACTIVE=se",
+                   "CERTNAME=${hostname}_infra",
                    "SPRING_CONFIG_LOCATION=/etc/eidas-proxy/$country/cfg/",
                    "PROXY_SERVICE_COOKIEENCRYPTPW=$proxy_service_cookie_encrypt_pw"]
    } ->