diff --git a/group_vars/all/vars.yaml b/group_vars/all/vars.yaml
index 061428b9186fdea524b649e320c253695c1160e2..328bc71d4f72b15c0970ecfae778522144325fd3 100644
--- a/group_vars/all/vars.yaml
+++ b/group_vars/all/vars.yaml
@@ -16,28 +16,35 @@ ansible_header: |
 # Crans subnets
 adm_subnet: 10.231.136.0/24
 
-# Role rsync-client
-to_backup:
-  - {
-  name: "var",
-  path: "/var",
-  auth_users: "backupcrans",
-  secrets_file: "/etc/rsyncd.secrets",
-  hosts_allow: ["zephir.adm.crans.org", "10.231.136.6"],
-  }
-  - {
-  name: "slash",
-  path: "/",
-  auth_users: "backupcrans",
-  secrets_file: "/etc/rsyncd.secrets",
-  hosts_allow: ["zephir.adm.crans.org", "10.231.136.6"],
-  }
-
-re2o:
-  server: re2o.adm.crans.org
-  service_user: "{{ vault_re2o_service_user }}"
-  service_password: "{{ vault_re2o_service_password }}"
-
-
-# global server definitions
-mail_server: smtp.adm.crans.org
+# # Role rsync-client
+# to_backup:
+#   - {
+#   name: "var",
+#   path: "/var",
+#   auth_users: "backupcrans",
+#   secrets_file: "/etc/rsyncd.secrets",
+#   hosts_allow: ["zephir.adm.crans.org", "10.231.136.6"],
+#   }
+#   - {
+#   name: "slash",
+#   path: "/",
+#   auth_users: "backupcrans",
+#   secrets_file: "/etc/rsyncd.secrets",
+#   hosts_allow: ["zephir.adm.crans.org", "10.231.136.6"],
+#   }
+#
+# re2o:
+#   server: re2o.adm.crans.org
+#   service_user: "{{ vault_re2o_service_user }}"
+#   service_password: "{{ vault_re2o_service_password }}"
+#
+#
+# # global server definitions
+# mail_server: smtp.adm.crans.org
+glob_ldap:
+  servers:
+    - 172.16.10.1
+    - 172.16.10.11
+    - 172.16.10.12
+    - 172.16.10.13
+  base: 'dc=crans,dc=org'
diff --git a/group_vars/slapd.yml b/group_vars/slapd.yml
new file mode 100644
index 0000000000000000000000000000000000000000..19292dcf2300167b7f71bf5c01fdcfe364975c35
--- /dev/null
+++ b/group_vars/slapd.yml
@@ -0,0 +1,6 @@
+---
+
+glob_slapd:
+  master_ip: 172.16.10.1
+  replication_credentials: "{{ vault_ldap_replication_credentials }}"
+
diff --git a/host_vars/daniel.adm.crans.org.yml b/host_vars/daniel.adm.crans.org.yml
index 2ecabb4382a2c63c23f0e1e6ae3f161a89b30a9b..a7405b4db07cedbdcb9da8899fdc00253e18badf 100644
--- a/host_vars/daniel.adm.crans.org.yml
+++ b/host_vars/daniel.adm.crans.org.yml
@@ -1,7 +1,8 @@
 ---
-ldap:
+loc_slapd:
   ip: 172.16.10.12
   replica: true
   replica_rid: 2
-  master_ip: 172.16.10.1
-  replication_credentials: "{{ vault_ldap_replication_credentials }}"
+
+loc_ldap:
+  local: false