diff --git a/group_vars/ethercalc.yml b/group_vars/ethercalc.yml
new file mode 100644
index 0000000000000000000000000000000000000000..bbcecf6fabb766e273c7c7a0073fdbb207d1dba9
--- /dev/null
+++ b/group_vars/ethercalc.yml
@@ -0,0 +1,2 @@
+glob_ethercalc:
+  ip: "{{ query('ldap', 'ip', ansible_hostname, 'adm') | ipv4 | first }}"
diff --git a/host_vars/ethercalc.adm.crans.org.yml b/host_vars/ethercalc.adm.crans.org.yml
index 78460542d26a36d77db65e93d49c9fb01ed3c070..2eb6f993a4287225249a71040a352e24e4c0e15b 100644
--- a/host_vars/ethercalc.adm.crans.org.yml
+++ b/host_vars/ethercalc.adm.crans.org.yml
@@ -2,6 +2,3 @@
 interfaces:
   adm: eth0
   srv_nat: eth1
-
-ethercalc:
-  ipv4: '172.16.10.133'
diff --git a/plays/ethercalc.yml b/plays/ethercalc.yml
index f7a6a03f61c97c3969bae9d3582852488a8ab275..3b8102c854f824948eb260cc2dfe1b4dd59f9c95 100755
--- a/plays/ethercalc.yml
+++ b/plays/ethercalc.yml
@@ -1,5 +1,7 @@
 #!/usr/bin/env ansible-playbook
 ---
 - hosts: ethercalc
+  vars:
+    ethercalc: "{{ glob_ethercalc | default({}) | combine(loc_ethercalc | default({})) }}"
   roles:
     - ethercalc
diff --git a/roles/ethercalc/templates/systemd/system/ethercalc.service.j2 b/roles/ethercalc/templates/systemd/system/ethercalc.service.j2
index 7f251cb5b53ff4d6a5f9d703865a2c172efe4851..f82fa90b5941b5ab54110da3680b69a1f353cb0a 100644
--- a/roles/ethercalc/templates/systemd/system/ethercalc.service.j2
+++ b/roles/ethercalc/templates/systemd/system/ethercalc.service.j2
@@ -11,7 +11,7 @@ RestartSec=3
 User=redis
 Group=redis
 PIDFile=/var/run/ethercalc.pid
-ExecStart=/usr/bin/ethercalc --host {{ ethercalc.ipv4 }} --port 8000
+ExecStart=/usr/bin/ethercalc --host {{ ethercalc.ip }} --port 8000
 
 [Install]
 WantedBy=multi-user.target