diff --git a/roles/docker/tasks/services/gluu.yml b/roles/docker/tasks/services/gluu.yml
index cc1e84c..1bc3beb 100644
--- a/roles/docker/tasks/services/gluu.yml
+++ b/roles/docker/tasks/services/gluu.yml
@@ -1,28 +1,22 @@
 - name: create gluu volume folders
   file:
-    name: "{{ volume_root_folder }}/{{ volume }}"
+    name: "{{ gluu.volume_folder }}/{{ volume }}"
     state: directory
   loop:
-    - "consul"
+    - "config-init/db"
     - "consul/data"
-    - "opendj"
     - "opendj/config"
     - "opendj/ldif"
     - "opendj/logs"
     - "opendj/db"
     - "opendj/flag"
     - "opendj/backup"
-    - "oxauth"
     - "oxauth/custom"
     - "oxauth/custom/pages"    
     - "oxauth/custom/static"
-    - "oxauth/lib"
     - "oxauth/lib/ext"
     - "oxauth/logs"
-    - "oxtrust"
-    - "oxtrust/custom"
     - "oxtrust/custom/pages"
-    - "oxtrust/lib"
     - "oxtrust/lib/ext"
     - "oxtrust/logs"
     - "shared-shibboleth-idp"
@@ -41,12 +35,12 @@
           command: agent -server -bootstrap -ui
           hostname: consul-1
           environment:
-            - CONSUL_BIND_INTERFACE=eth0
+            - CONSUL_BIND_INTER FACE=eth0
             - CONSUL_CLIENT_INTERFACE=eth0
           container_name: consul
           restart: unless-stopped
           volumes:
-            - "{{ volume_root_folder }}/consul:/consul/data"
+            - "{{ gluu.volume_folder }}/consul:/consul/data"
           labels:
             - "SERVICE_IGNORE=yes"
           restart: unless-stopped
@@ -107,12 +101,12 @@
             - GLUU_CERT_ALT_NAME=ldap
           container_name: ldap
           volumes:
-            - "{{ volume_root_folder }}/opendj/config:/opt/opendj/config"
-            - "{{ volume_root_folder }}/opendj/ldif:/opt/opendj/ldif"
-            - "{{ volume_root_folder }}/opendj/logs:/opt/opendj/logs"
-            - "{{ volume_root_folder }}/opendj/db:/opt/opendj/db"
-            - "{{ volume_root_folder }}/opendj/flag:/flag"
-            - "{{ volume_root_folder }}/opendj/backup:/opt/opendj/bak"
+            - "{{ gluu.volume_folder }}/opendj/config:/opt/opendj/config"
+            - "{{ gluu.volume_folder }}/opendj/ldif:/opt/opendj/ldif"
+            - "{{ gluu.volume_folder }}/opendj/logs:/opt/opendj/logs"
+            - "{{ gluu.volume_folder }}/opendj/db:/opt/opendj/db"
+            - "{{ gluu.volume_folder }}/opendj/flag:/flag"
+            - "{{ gluu.volume_folder }}/opendj/backup:/opt/opendj/bak"
           restart: unless-stopped
           labels:
             - "SERVICE_IGNORE=yes"
@@ -128,10 +122,10 @@
             - "{{gluu.domain}}:85.235.225.231"
           container_name: oxauth
           volumes:
-            - "{{ volume_root_folder }}/oxauth/custom/pages:/opt/gluu/jetty/oxauth/custom/pages"
-            - "{{ volume_root_folder }}/oxauth/custom/static:/opt/gluu/jetty/oxauth/custom/static"
-            - "{{ volume_root_folder }}/oxauth/lib/ext:/opt/gluu/jetty/oxauth/lib/ext"
-            - "{{ volume_root_folder }}/oxauth/logs:/opt/gluu/jetty/oxauth/logs"
+            - "{{ gluu.volume_folder }}/oxauth/custom/pages:/opt/gluu/jetty/oxauth/custom/pages"
+            - "{{ gluu.volume_folder }}/oxauth/custom/static:/opt/gluu/jetty/oxauth/custom/static"
+            - "{{ gluu.volume_folder }}/oxauth/lib/ext:/opt/gluu/jetty/oxauth/lib/ext"
+            - "{{ gluu.volume_folder }}/oxauth/logs:/opt/gluu/jetty/oxauth/logs"
           mem_limit: 1536M
           restart: unless-stopped
           labels:
@@ -152,11 +146,11 @@
             - "{{gluu.domain}}:85.235.225.231"
           container_name: oxtrust
           volumes:
-            - "{{ volume_root_folder }}/oxtrust/custom/pages:/opt/gluu/jetty/identity/custom/pages"
-            - "{{ volume_root_folder }}/oxtrust/custom/static:/opt/gluu/jetty/identity/custom/static"
-            - "{{ volume_root_folder }}/oxtrust/lib/ext:/opt/gluu/jetty/identity/lib/ext"
-            - "{{ volume_root_folder }}/oxtrust/logs:/opt/gluu/jetty/identity/logs"
-            - "{{ volume_root_folder }}/shared-shibboleth-idp:/opt/shared-shibboleth-idp"
+            - "{{ gluu.volume_folder }}/oxtrust/custom/pages:/opt/gluu/jetty/identity/custom/pages"
+            - "{{ gluu.volume_folder }}/oxtrust/custom/static:/opt/gluu/jetty/identity/custom/static"
+            - "{{ gluu.volume_folder }}/oxtrust/lib/ext:/opt/gluu/jetty/identity/lib/ext"
+            - "{{ gluu.volume_folder }}/oxtrust/logs:/opt/gluu/jetty/identity/logs"
+            - "{{ gluu.volume_folder }}/shared-shibboleth-idp:/opt/shared-shibboleth-idp"
           mem_limit: 1536M
           restart: unless-stopped
           labels:
@@ -176,7 +170,7 @@
             - "{{gluu.domain}}:85.235.225.231"
           container_name: oxshibboleth
           volumes:
-            - "{{ volume_root_folder }}/volumes/shared-shibboleth-idp:/opt/shared-shibboleth-idp"
+            - "{{ gluu.volume_folder }}/volumes/shared-shibboleth-idp:/opt/shared-shibboleth-idp"
           mem_limit: 1024M
           restart: unless-stopped
           labels: