diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 506f4ba2..eec97cb9 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -255,12 +255,15 @@ class eidas_connector($version="1.0.6",$hostname='localhost') {
       hiera_key => 'eidas_connector_tomcat_key',
       base64    => true
    } ->
+   file {['/etc/luna','/etc/luna/cert']: ensure => directory } ->
    sunet::docker_run {'eidas-connector':
       image    => 'docker.sunet.se/eidas-connector',
       imagetag => $_version,
       ports    => ['443:8443'],
       volumes  => ['/var/log/eidas-connector:/var/log/eidas-connector',
                    '/etc/eidas-connector:/etc/eidas-connector',
+                   '/dev/log:/dev/log',
+                   '/etc/luna/cert:/usr/safenet/lunaclient/cert',
                    '/etc/ssl:/etc/ssl'],
       env      => ["IDP_SERVER_HOSTNAME=$_hostname",
                    "TOMCAT_HOSTNAME=$_hostname",
@@ -290,12 +293,15 @@ class eidas_proxy($version='1.0.0',$country='se',$hostname='localhost') {
       hiera_key => 'eidas_proxy_key',
       base64    => true
    } ->
+   file {['/etc/luna','/etc/luna/cert']: ensure => directory } ->
    sunet::docker_run {'eidas-proxy':
       image    => 'docker.sunet.se/eidas-proxy',
       imagetag => $_version,
       ports    => ['443:8443','127.0.0.01:444:8444'],
       volumes  => ['/var/log/eidas-proxy:/var/log/eidas-proxy',
                    '/etc/eidas-proxy:/etc/eidas-proxy',
+                   '/dev/log:/dev/log',
+                   '/etc/luna/cert:/usr/safenet/lunaclient/cert',
                    '/etc/ssl:/etc/ssl'],
       env      => ["PROXY_SERVICE_DOMAIN_PREFIX=https://$_hostname/eidas-ps",
                    "SPRING_PROFILES_ACTIVE=se",