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 ca54c40b..085a42b8 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
@@ -4,15 +4,15 @@ services:
     image: docker.sunet.se/eidas-connector:<%= @version %>
     container_name: eidas-connector
     environment:
-      - CONNECTOR_DIRECTORY=<%= @connector_directory %>
-      - SPRING_CONFIG_ADDITIONAL_LOCATION=<%= @connector_directory %>
+      - CONNECTOR_DIRECTORY=/etc/eidas-connector
+      - SPRING_CONFIG_ADDITIONAL_LOCATION=/etc/eidas-connector
       - SPRING_PROFILES_ACTIVE=<%= @environment %>
       - PKCS11_PIN=<%= @pkcs11_pin %>
 
     hostname: <%= @server_fqdn %>
 
     volumes:
-      - '<%= @connector_directory %>:<%= @connector_directory %>'
+      - '<%= @connector_directory %>:/etc/eidas-connector'
       - '/etc/ssl:/etc/ssl'
       - '/etc/luna/cert:/usr/safenet/lunaclient/cert'
       - '/etc/Chrystoki.conf.d:/etc/Chrystoki.conf.d'