diff --git a/roles/is-collector/templates/docker-compose.yml.j2 b/roles/is-collector/templates/docker-compose.yml.j2
index 1478bb9..170686d 100644
--- a/roles/is-collector/templates/docker-compose.yml.j2
+++ b/roles/is-collector/templates/docker-compose.yml.j2
@@ -43,7 +43,7 @@ services:
         gid: "333"
         mode: 0440
       - source: {{ service_prefix }}-jndi-config-{{ scope_name }}
-        target: /home/gcube/gCore/etc/is-collector-service/jndi-config.xml
+        target: /home/gcube/gCore/{{ config_dir }}/jndi-config.xml
         uid: "333"
         gid: "333"
         mode: 0440
diff --git a/roles/is-registry/templates/docker-compose.yml.j2 b/roles/is-registry/templates/docker-compose.yml.j2
index ad2ba83..1b7ae9d 100644
--- a/roles/is-registry/templates/docker-compose.yml.j2
+++ b/roles/is-registry/templates/docker-compose.yml.j2
@@ -32,7 +32,7 @@ services:
         gid: "333"
         mode: 0440
       - source: jndi-config-{{ scope_name }}
-        target: /home/gcube/gCore/etc/is-registry-service/jndi-config.xml
+        target: /home/gcube/gCore/{{ config_dir }}/jndi-config.xml
         uid: "333"
         gid: "333"
         mode: 0440