diff --git a/global/overlay/etc/puppet/modules/eid/templates/connector/docker-compose.yml.erb b/global/overlay/etc/puppet/modules/eid/templates/connector/docker-compose.yml.erb
index 8e442196..2c89b8b6 100644
--- a/global/overlay/etc/puppet/modules/eid/templates/connector/docker-compose.yml.erb
+++ b/global/overlay/etc/puppet/modules/eid/templates/connector/docker-compose.yml.erb
@@ -16,8 +16,10 @@ services:
     volumes:
       - '<%= @connector_directory %>:/etc/eidas-connector'
       - '/etc/ssl:/etc/ssl'
+<% if @use_hsm -%>
       - '/etc/luna/cert:/usr/safenet/lunaclient/cert'
       - '/etc/Chrystoki.conf.d:/etc/Chrystoki.conf.d'
+<% end -%>
 
     ports:
       - "443:8443"