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 905b625c..8e442196 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
@@ -7,7 +7,9 @@ services:
       - CONNECTOR_DIRECTORY=/etc/eidas-connector
       - SPRING_CONFIG_ADDITIONAL_LOCATION=/etc/eidas-connector/
       - SPRING_PROFILES_ACTIVE=<%= @environment %>
+<% if @use_hsm -%>
       - PKCS11_PIN=<%= @pkcs11_pin %>
+<% end -%>
 
     hostname: <%= @server_fqdn %>