diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 5a744012..a345bb9f 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -277,6 +277,7 @@ class eidas_connector($version="1.0.6",$hostname='localhost') {
    sunet::docker_run {'eidas-connector':
       image    => 'docker.sunet.se/eidas-connector',
       imagetag => $_version,
+      hostname => "${::fqdn}",
       ports    => ['443:8443'],
       volumes  => ['/var/log/eidas-connector:/var/log/eidas-connector',
                    '/etc/eidas-connector:/etc/eidas-connector',
@@ -316,6 +317,7 @@ class eidas_proxy($version='1.0.0',$country='se',$hostname='localhost') {
    sunet::docker_run {'eidas-proxy':
       image    => 'docker.sunet.se/eidas-proxy',
       imagetag => $_version,
+      hostname => "${::fqdn}",
       ports    => ['443:8443','127.0.0.01:444:8444'],
       volumes  => ['/var/log/eidas-proxy:/var/log/eidas-proxy',
                    '/etc/eidas-proxy:/etc/eidas-proxy',