diff --git a/inventory/group_vars/9iron.yml b/inventory/group_vars/9iron.club.yml
similarity index 100%
rename from inventory/group_vars/9iron.yml
rename to inventory/group_vars/9iron.club.yml
diff --git a/inventory/hosts.yml b/inventory/hosts.yml
index 9a2d60d..86ee908 100644
--- a/inventory/hosts.yml
+++ b/inventory/hosts.yml
@@ -12,19 +12,15 @@ all:
           ansible_host: 172.23.100.1
         lap-th-e560-0:
           ansible_host: 172.23.100.2
-    9iron:
+    9iron.club:
       children:
         webservers:
         gameservers:
     webservers:
       hosts:
-        web1:
-          ansible_host: web1.9iron.club
-        web2:
-          ansible_host: web2.9iron.club
-        fedi1:
-          ansible_host: fedi1.9iron.club
+        web1.9iron.club:
+        web2.9iron.club:
+        fedi1.9iron.club:
     gameservers:
       hosts:
-        game1:
-          ansible_host: game1.9iron.club
+        game1.9iron.club:
diff --git a/playbooks/gameservers.yml b/playbooks/gameservers.yml
index a1ab3ca..286a26c 100644
--- a/playbooks/gameservers.yml
+++ b/playbooks/gameservers.yml
@@ -1,7 +1,7 @@
 #!/usr/bin/env ansible-playbook
 # vim:ft=ansible:
 ---
-- hosts: game1
+- hosts: game1.9iron.club
   roles:
     - role: backups
       tags: [ backups ]
diff --git a/playbooks/webservers.yml b/playbooks/webservers.yml
index 0a5bf7c..a9dd523 100644
--- a/playbooks/webservers.yml
+++ b/playbooks/webservers.yml
@@ -4,13 +4,13 @@
 - hosts: webservers
   roles:
     - apache-php
-- hosts: fedi1
+- hosts: fedi1.9iron.club
   roles:
     - role: backups
       tags: [ backups ]
     - role: matrix
       tags: [ fedi, matrix ]
-- hosts: web1
+- hosts: web1.9iron.club
   roles:
     - role: backups
       vars:
@@ -36,7 +36,7 @@
         gitweb_url: "www.9iron.club"
         gitweb_webroot: "/var/www/www"
       tags: [ web, webroot ]
-- hosts: web2
+- hosts: web2.9iron.club
   roles:
     - role: backups
       tags: [ backups ]