diff --git a/host_vars/azerty/ansible.yml b/host_vars/azerty/ansible.yml
new file mode 100644
index 0000000..3a0fc80
--- /dev/null
+++ b/host_vars/azerty/ansible.yml
@@ -0,0 +1,2 @@
+---
+ansible_host: "azerty.fil.sand.auro.re"
diff --git a/host_vars/azerty.fil.sand.auro.re/networking.yml b/host_vars/azerty/networking.yml
similarity index 100%
rename from host_vars/azerty.fil.sand.auro.re/networking.yml
rename to host_vars/azerty/networking.yml
diff --git a/host_vars/azerty.fil.sand.auro.re/vpn.yml b/host_vars/azerty/vpn.yml
similarity index 100%
rename from host_vars/azerty.fil.sand.auro.re/vpn.yml
rename to host_vars/azerty/vpn.yml
diff --git a/host_vars/hellman/ansible.yml b/host_vars/hellman/ansible.yml
new file mode 100644
index 0000000..4a8f3be
--- /dev/null
+++ b/host_vars/hellman/ansible.yml
@@ -0,0 +1,2 @@
+---
+ansible_host: "hellman.fil.sand.auro.re"
diff --git a/host_vars/hellman.fil.sand.auro.re/networking.yml b/host_vars/hellman/networking.yml
similarity index 100%
rename from host_vars/hellman.fil.sand.auro.re/networking.yml
rename to host_vars/hellman/networking.yml
diff --git a/host_vars/hellman.fil.sand.auro.re/vpn.yml b/host_vars/hellman/vpn.yml
similarity index 100%
rename from host_vars/hellman.fil.sand.auro.re/vpn.yml
rename to host_vars/hellman/vpn.yml
diff --git a/host_vars/hindley/ansible.yml b/host_vars/hindley/ansible.yml
new file mode 100644
index 0000000..287daec
--- /dev/null
+++ b/host_vars/hindley/ansible.yml
@@ -0,0 +1,2 @@
+---
+ansible_host: "hindley.adh.auro.re"
diff --git a/host_vars/hindley.adh.auro.re/networking.yml b/host_vars/hindley/networking.yml
similarity index 100%
rename from host_vars/hindley.adh.auro.re/networking.yml
rename to host_vars/hindley/networking.yml
diff --git a/host_vars/hindley.adh.auro.re/vpn.yml b/host_vars/hindley/vpn.yml
similarity index 100%
rename from host_vars/hindley.adh.auro.re/vpn.yml
rename to host_vars/hindley/vpn.yml
diff --git a/hosts b/hosts
index 47a32d7..cef2ec1 100644
--- a/hosts
+++ b/hosts
@@ -3,10 +3,10 @@ all:
   children:
     ubuntu:
       hosts:
-        hindley.adh.auro.re:
+        hindley:
     debian_buster:
       hosts:
-        azerty.fil.sand.auro.re:
+        azerty:
         dns-histausse.fil.sand.auro.re:
         networking-pp.fil.sand.auro.re:
         vm1:
@@ -14,23 +14,23 @@ all:
         vm3:
     proxmox_buster:
       hosts:
-        hellman.fil.sand.auro.re:
+        hellman:
     raspbian_buster:
       hosts:
         rossum:
     proxy:
       hosts:
-        hindley.adh.auro.re:
+        hindley:
     dns:
       hosts:
         dns-histausse.fil.sand.auro.re:
     keycloak_host:
       hosts:
-        azerty.fil.sand.auro.re:
+        azerty:
             server_hostname: azerty.fil.sand.auro.re
     gitea_host:
       hosts:
-        azerty.fil.sand.auro.re:
+        azerty:
           server_hostname: azerty.fil.sand.auro.re
     tests:
       hosts:
@@ -39,7 +39,7 @@ all:
         vm3:
     vpn:
       hosts:
-        azerty.fil.sand.auro.re:
-        hindley.adh.auro.re:
-        hellman.fil.sand.auro.re:
+        azerty:
+        hindley:
+        hellman:
         rossum: