diff --git a/group_vars/dhcp.yml b/group_vars/dhcp.yml
index a92e2867..bbdadaaa 100644
--- a/group_vars/dhcp.yml
+++ b/group_vars/dhcp.yml
@@ -63,11 +63,12 @@ glob_dhcp:
           max: 100.65.255.254
       options: []
 
-re2o:
+glob_re2o_services:
   server: re2o.adm.crans.org
-  service_user: "ploptotoisverysecure"
-  service_password: "ploptotoisverysecure"
+  service:
+    user: services
+    password: "{{ vault_re2o_service_password }}"
+  mail_server: "{{ glob_smtp }}"
 
-mail_server: smtp.adm.crans.org
 glob_re2o_dhcp:
   uri: "https://gitlab.adm.crans.org/nounous/re2o-dhcp.git"
diff --git a/plays/dhcp.yml b/plays/dhcp.yml
index 969229ef..8426d0e5 100755
--- a/plays/dhcp.yml
+++ b/plays/dhcp.yml
@@ -4,6 +4,7 @@
 - hosts: dhcp
   vars:
     dhcp: "{{ glob_dhcp | default({}) | combine(loc_dhcp | default({})) }}"
+    re2o_services: "{{ glob_re2o_services | default({}) | combine(loc_re2o_services | default({})) }}"
     re2o_dhcp: "{{ glob_re2o_dhcp | default({}) | combine(loc_re2o_dhcp | default({})) }}"
   roles:
     - isc-dhcp-server
diff --git a/roles/re2o-services/templates/re2o-services/config.ini.j2 b/roles/re2o-services/templates/re2o-services/config.ini.j2
index 38cbd755..81aed4ae 100644
--- a/roles/re2o-services/templates/re2o-services/config.ini.j2
+++ b/roles/re2o-services/templates/re2o-services/config.ini.j2
@@ -1,9 +1,9 @@
-{{ ansible_header | comment(decoration='; ') }}
+{{ ansible_header | comment(decoration='# ') }}
 [Re2o]
-hostname = {{ re2o.server }}
-username = {{ re2o.service_user }}
-password = {{ re2o.service_password }}
+hostname = {{ re2o_services.server }}
+username = {{ re2o_services.service.user }}
+password = {{ re2o_services.service.password }}
 
 [Mail]
-mailserver = {{ mail_server }}
+mailserver = {{ re2o_services.mail_server }}
 port = 25