diff --git a/group_vars/linx.yml b/group_vars/linx.yml
new file mode 100644
index 0000000000000000000000000000000000000000..4523854c9e2d92f9c06e2ed68a2113351086c50e
--- /dev/null
+++ b/group_vars/linx.yml
@@ -0,0 +1,4 @@
+---
+glob_linx:
+  siteurl: "https://linx.crans.org/"
+  name: "CRANS Linx"
diff --git a/host_vars/linx.adm.crans.org.yml b/host_vars/linx.adm.crans.org.yml
new file mode 100644
index 0000000000000000000000000000000000000000..9f8e71f2cb2fb516f86e43a9a11816a2dcdd4a43
--- /dev/null
+++ b/host_vars/linx.adm.crans.org.yml
@@ -0,0 +1,3 @@
+---
+loc_linx:
+  ip: "{{ query('ldap', 'ip', 'linx', 'adm') | first }}"
diff --git a/hosts b/hosts
index cb195e01b4edadde34ab64327e35aa9f6b271caa..a31b5959bb8c143131e5fb03f0add0382ba4b7f5 100644
--- a/hosts
+++ b/hosts
@@ -67,6 +67,9 @@ sam.adm.crans.org
 daniel.adm.crans.org
 jack.adm.crans.org
 
+[linx]
+linx.adm.crans.org
+
 [monitoring]
 monitoring.adm.crans.org
 
diff --git a/plays/linx.yml b/plays/linx.yml
index 80c298640addc04e8497f848001db9f717ae7b13..6ef26cf19aa322a2d9831296e9eb8ec8099bb25c 100755
--- a/plays/linx.yml
+++ b/plays/linx.yml
@@ -1,9 +1,7 @@
 #!/usr/bin/env ansible-playbook
 ---
-- hosts: linx.adm.crans.org
+- hosts: linx
   vars:
-    linx:
-      ip: "{{ query('ldap', 'ip', 'linx', 'adm') }}"
-      siteurl: "https://linx.crans.org/"
+    linx: "{{ glob_linx | default({}) | combine(loc_linx | default({})) }}"
   roles:
     - linx
diff --git a/roles/linx/templates/linx/server.conf.j2 b/roles/linx/templates/linx/server.conf.j2
index 25af772cf4f6dff9d88be77611dd8503fcef0dcb..984f37f11185d5f6809d87e52b5368fae9f374ba 100644
--- a/roles/linx/templates/linx/server.conf.j2
+++ b/roles/linx/templates/linx/server.conf.j2
@@ -1,7 +1,7 @@
 {{ ansible_header | comment }}
 
 bind = {{ linx.ip }}:8080
-sitename = CRANS Linx
+sitename = {{ linx.name }}
 siteurl = {{ linx.siteurl }}
 maxsize = 10000000
 maxexpiry = 604800