diff --git a/env/.env b/env/.env
index acab64c..b02444c 100644
--- a/env/.env
+++ b/env/.env
@@ -100,13 +100,20 @@ LDAP_BASEDN=dc=nine,dc=org
 LDAP_ADMIN_USERNAME=${ADMIN_USER}
 LDAP_USER=cn=${LDAP_ADMIN_USERNAME},${LDAP_BASEDN}
 LDAP_PASSWORD=${ADMIN_PASSWORD}
-LDAP_BASEORGANISATION=ou=ninegate,${LDAP_BASEDN}
+LDAP_OUORGANISATION=nine
+LDAP_OUNIVEAU01=niveau01
+LDAP_OUNIVEAU02=niveau02
+LDAP_OUNIVEAU03=niveau03
+LDAP_OUNIVEAU04=niveau04
+LDAP_OUGROUP=groups
+LDAP_BASEORGANISATION=ou=${LDAP_OUORGANISATION},${LDAP_BASEDN}
+LDAP_BASENIVEAU01=ou=${LDAP_OUNIVEAU01},${LDAP_BASEORGANISATION}
+LDAP_BASENIVEAU02=ou=${LDAP_OUNIVEAU02},${LDAP_BASEORGANISATION}
+LDAP_BASENIVEAU03=ou=${LDAP_OUNIVEAU03},${LDAP_BASEORGANISATION}
+LDAP_BASENIVEAU04=ou=${LDAP_OUNIVEAU04},${LDAP_BASEORGANISATION}
 LDAP_BASEUSER=ou=users,${LDAP_BASEORGANISATION}
-LDAP_BASENIVEAU01=ou=niveau01,${LDAP_BASEORGANISATION}
-LDAP_BASENIVEAU02=ou=niveau02,${LDAP_BASEORGANISATION}
-LDAP_BASENIVEAU03=ou=niveau03,${LDAP_BASEORGANISATION}
-LDAP_BASENIVEAU04=ou=niveau04,${LDAP_BASEORGANISATION}
-LDAP_BASEGROUP=ou=groups,${LDAP_BASEORGANISATION}
+LDAP_BASEGROUP=ou=${LDAP_OUGROUP},${LDAP_BASEORGANISATION}
+
 LDAP_SYNC=1 
 LDAP_TEMPLATE=open
 
@@ -122,7 +129,7 @@ LDAP_GROUP_NAME=cn
 LDAP_GROUP_MEMBER=memberUid
 LDAP_GROUP_MEMBERISDN=0
 
-LDAP_LOGIN_FILTER="(&(${LDAP_USERNAME}=%uid%)(objectClass=person)(!(description=Computer)))"
+LDAP_LOGIN_FILTER="(&(${LDAP_USERNAME}=%uid)(objectClass=person)(!(description=Computer)))"
 LDAP_USER_FILTER="(&(${LDAP_USERNAME}=*)(objectClass=person)(!(description=Computer)))"
 LDAP_GROUP_FILTER="(&(objectClass=posixGroup))"
 
diff --git a/services/30-openldap/dicos/.env.dicos b/services/30-openldap/dicos/.env.dicos
new file mode 100644
index 0000000..1d31950
--- /dev/null
+++ b/services/30-openldap/dicos/.env.dicos
@@ -0,0 +1,2 @@
+templates=services/30-openldap/tmpl/nine.ldif
+destinations=services/30-openldap/volume/nine/ldif/nine.ldif
diff --git a/services/30-openldap/tmpl/nine.ldif b/services/30-openldap/tmpl/nine.ldif
new file mode 100755
index 0000000..b6763b6
--- /dev/null
+++ b/services/30-openldap/tmpl/nine.ldif
@@ -0,0 +1,66 @@
+# Entrée 3: ${LDAP_BASEORGANISATION}
+dn: ${LDAP_BASEORGANISATION}
+objectclass: organizationalUnit
+objectclass: top
+ou: ${LDAP_OUORGANISATION}
+
+# Entrée 4: ${LDAP_BASENIVEAU01}
+dn: ${LDAP_BASENIVEAU01}
+objectclass: organizationalUnit
+objectclass: top
+ou: ${LDAP_OUNIVEAU01}
+
+# Entrée 5: cn=${LDAP_OUORGANISATION},${LDAP_BASENIVEAU01}
+dn: cn=${LDAP_OUORGANISATION},${LDAP_BASENIVEAU01}
+objectclass: posixGroup
+objectclass: top
+objectclass: sambaGroupMapping
+objectclass: cadolesGroup
+objectclass: cadolesSiren
+cn: ${LDAP_OUORGANISATION}
+gidnumber: 1
+memberuid: ${ADMIN_USER}
+cadolesMember: ${LDAP_USERNAME}=${ADMIN_USER},${LDAP_BASEUSER}
+sambagrouptype: 2
+sambasid: 1
+siren: ${LDAP_OUORGANISATION}
+
+# Entrée 6: ${LDAP_BASENIVEAU02}
+dn: ${LDAP_BASENIVEAU02}
+objectclass: organizationalUnit
+objectclass: top
+ou: ${LDAP_OUNIVEAU02}
+
+# Entrée 7: ${LDAP_BASEGROUP}
+dn: ${LDAP_BASEGROUP}
+objectclass: organizationalUnit
+objectclass: top
+ou: ${LDAP_OUNIVEAU02}
+
+# Entrée 8: ${LDAP_BASEUSER}
+dn: ${LDAP_BASEUSER}
+objectclass: organizationalUnit
+objectclass: top
+ou: users
+
+# Entrée 9: ${LDAP_USERNAME}=${ADMIN_USER},${LDAP_BASEUSER}
+dn: ${LDAP_USERNAME}=${ADMIN_USER},${LDAP_BASEUSER}
+objectclass: top
+objectclass: person
+objectclass: organizationalPerson
+objectclass: inetOrgPerson
+objectclass: cadolesPerson
+objectclass: cadolesSiren
+objectclass: cadolesSiret
+authlevel: simple
+${LDAP_USERNAME}: ${ADMIN_USER}
+cn: ${ADMIN_USER}
+${LDAP_LASTNAME}: ${ADMIN_USER}
+${LDAP_DISPLAYNAME}: ${ADMIN_USER}
+${LDAP_FIRSTNAME}: ${ADMIN_USER}
+${LDAP_EMAIL}: ${ADMIN_EMAIL}
+siren: ${LDAP_OUORGANISATION}
+${LDAP_OUNIVEAU01}: ${LDAP_OUNIVEAU01}
+userpassword: {SSHA}JYfvUM9Hf/v/NbWR5zgUkt4E5lBRGuR2
+
+
diff --git a/services/30-openldap/volume/nine/changepassword.sh b/services/30-openldap/volume/nine/changepassword.sh
index 91e5834..ef27c80 100755
--- a/services/30-openldap/volume/nine/changepassword.sh
+++ b/services/30-openldap/volume/nine/changepassword.sh
@@ -1 +1 @@
-ldappasswd -x -H ldap://${LDAP_HOST}:${LDAP_PORT} -D ${LDAP_USER} -w ${LDAP_PASSWORD} -s $2 "uid=$1,ou=users,ou=ninegate,dc=nine,dc=org"
\ No newline at end of file
+ldappasswd -x -H ldap://${LDAP_HOST}:${LDAP_PORT} -D ${LDAP_USER} -w ${LDAP_PASSWORD} -s $2 "${LDAP_USERNAME}=$1,${LDAP_BASEUSER}"
\ No newline at end of file
diff --git a/services/30-openldap/volume/nine/init.sh b/services/30-openldap/volume/nine/init.sh
index fca2527..fcfaa12 100755
--- a/services/30-openldap/volume/nine/init.sh
+++ b/services/30-openldap/volume/nine/init.sh
@@ -10,7 +10,7 @@ then
     ldapdelete ou=users,${LDAP_BASEDN} -r -H ldap://${LDAP_HOST}:${LDAP_PORT} -D ${LDAP_USER} -w ${LDAP_PASSWORD} 2>/dev/null
 
     # Integration du ldif de base
-    ldapadd -H ldap://${LDAP_HOST}:${LDAP_PORT} -D ${LDAP_USER} -w ${LDAP_PASSWORD} -f '/nine/ldif/cadoles.ldif' 2>/dev/null
+    ldapadd -H ldap://${LDAP_HOST}:${LDAP_PORT} -D ${LDAP_USER} -w ${LDAP_PASSWORD} -f '/nine/ldif/nine.ldif' 2>/dev/null
 
     /nine/changepassword.sh admin ${ADMIN_PASSWORD}
 
diff --git a/services/30-openldap/volume/nine/ldif/.gitkeep b/services/30-openldap/volume/nine/ldif/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/services/30-openldap/volume/nine/ldif/cadoles.ldif b/services/30-openldap/volume/nine/ldif/cadoles.ldif
deleted file mode 100755
index 1dff8c4..0000000
--- a/services/30-openldap/volume/nine/ldif/cadoles.ldif
+++ /dev/null
@@ -1,66 +0,0 @@
-# Entrée 3: ou=ninegate,dc=nine,dc=org
-dn: ou=ninegate,dc=nine,dc=org
-objectclass: organizationalUnit
-objectclass: top
-ou: ninegate
-
-# Entrée 4: ou=niveau01,ou=ninegate,dc=nine,dc=org
-dn: ou=niveau01,ou=ninegate,dc=nine,dc=org
-objectclass: organizationalUnit
-objectclass: top
-ou: niveau01
-
-# Entrée 5: cn=nine,ou=niveau01,ou=ninegate,dc=nine,dc=org
-dn: cn=nine,ou=niveau01,ou=ninegate,dc=nine,dc=org
-objectclass: posixGroup
-objectclass: top
-objectclass: sambaGroupMapping
-objectclass: cadolesGroup
-objectclass: cadolesSiren
-cn: nine
-gidnumber: 1
-memberuid: admin
-cadolesMember: uid=admin,ou=users,ou=ninegate,dc=nine,dc=org
-sambagrouptype: 2
-sambasid: 1
-siren: Ninegate
-
-# Entrée 6: ou=niveau02,ou=ninegate,dc=nine,dc=org
-dn: ou=niveau02,ou=ninegate,dc=nine,dc=org
-objectclass: organizationalUnit
-objectclass: top
-ou: niveau02
-
-# Entrée 7: ou=groups,ou=ninegate,dc=nine,dc=org
-dn: ou=groups,ou=ninegate,dc=nine,dc=org
-objectclass: organizationalUnit
-objectclass: top
-ou: groups
-
-# Entrée 8: ou=users,ou=ninegate,dc=nine,dc=org
-dn: ou=users,ou=ninegate,dc=nine,dc=org
-objectclass: organizationalUnit
-objectclass: top
-ou: users
-
-# Entrée 9: uid=admin,ou=users,ou=ninegate,dc=nine,dc=org
-dn: uid=admin,ou=users,ou=ninegate,dc=nine,dc=org
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-objectclass: cadolesPerson
-objectclass: cadolesSiren
-objectclass: cadolesSiret
-authlevel: simple
-uid: admin
-cn: nine
-sn: nine
-displayname: Administrateur nine
-givenname: Administrateur
-mail: admin@no-reply.fr
-siren: 0000000A
-niveau01: nine
-userpassword: {SSHA}JYfvUM9Hf/v/NbWR5zgUkt4E5lBRGuR2
-
-
diff --git a/services/30-openldap/volume/nine/ldif/nine.ldif b/services/30-openldap/volume/nine/ldif/nine.ldif
new file mode 100644
index 0000000..33b684e
--- /dev/null
+++ b/services/30-openldap/volume/nine/ldif/nine.ldif
@@ -0,0 +1,66 @@
+# Entrée 3: ou=nine,dc=nine,dc=org
+dn: ou=nine,dc=nine,dc=org
+objectclass: organizationalUnit
+objectclass: top
+ou: nine
+
+# Entrée 4: ou=niveau01,ou=nine,dc=nine,dc=org
+dn: ou=niveau01,ou=nine,dc=nine,dc=org
+objectclass: organizationalUnit
+objectclass: top
+ou: niveau01
+
+# Entrée 5: cn=nine,ou=niveau01,ou=nine,dc=nine,dc=org
+dn: cn=nine,ou=niveau01,ou=nine,dc=nine,dc=org
+objectclass: posixGroup
+objectclass: top
+objectclass: sambaGroupMapping
+objectclass: cadolesGroup
+objectclass: cadolesSiren
+cn: nine
+gidnumber: 1
+memberuid: admin
+cadolesMember: uid=admin,ou=users,ou=nine,dc=nine,dc=org
+sambagrouptype: 2
+sambasid: 1
+siren: nine
+
+# Entrée 6: ou=niveau02,ou=nine,dc=nine,dc=org
+dn: ou=niveau02,ou=nine,dc=nine,dc=org
+objectclass: organizationalUnit
+objectclass: top
+ou: niveau02
+
+# Entrée 7: ou=groups,ou=nine,dc=nine,dc=org
+dn: ou=groups,ou=nine,dc=nine,dc=org
+objectclass: organizationalUnit
+objectclass: top
+ou: niveau02
+
+# Entrée 8: ou=users,ou=nine,dc=nine,dc=org
+dn: ou=users,ou=nine,dc=nine,dc=org
+objectclass: organizationalUnit
+objectclass: top
+ou: users
+
+# Entrée 9: uid=admin,ou=users,ou=nine,dc=nine,dc=org
+dn: uid=admin,ou=users,ou=nine,dc=nine,dc=org
+objectclass: top
+objectclass: person
+objectclass: organizationalPerson
+objectclass: inetOrgPerson
+objectclass: cadolesPerson
+objectclass: cadolesSiren
+objectclass: cadolesSiret
+authlevel: simple
+uid: admin
+cn: admin
+sn: admin
+displayName: admin
+givenname: admin
+mail: admin@noreply.fr
+siren: nine
+niveau01: niveau01
+userpassword: {SSHA}JYfvUM9Hf/v/NbWR5zgUkt4E5lBRGuR2
+
+
diff --git a/services/50-ninegate/env/.env b/services/50-ninegate/env/.env
index 358c5f8..f44dbf5 100644
--- a/services/50-ninegate/env/.env
+++ b/services/50-ninegate/env/.env
@@ -7,6 +7,9 @@ DATABASE_USER=${MARIADB_USER}
 DATABASE_PASSWORD=${MARIADB_PASSWORD}
 DATABASE_HOST=${MARIADB_SERVICE_NAME}
 
+# Init
+LIBELLE_ETAB=${LDAP_OUORGANISATION}
+
 # Activation Widget
 ACTIVATE_WIDADMINER=${ADMINER_ACTIVATE}
 WIDADMINER_URL="${ADMINER_URL}"