diff --git a/all.yml b/group-all.yml
similarity index 100%
rename from all.yml
rename to group-all.yml
diff --git a/proxmox.yml b/group-proxmox.yml
similarity index 100%
rename from proxmox.yml
rename to group-proxmox.yml
diff --git a/holmium.yml b/host-holmium.yml
similarity index 100%
rename from holmium.yml
rename to host-holmium.yml
diff --git a/krypton.yml b/host-krypton.yml
similarity index 100%
rename from krypton.yml
rename to host-krypton.yml
diff --git a/oganesson.yml b/host-oganesson.yml
similarity index 100%
rename from oganesson.yml
rename to host-oganesson.yml
diff --git a/platon.yml b/host-platon.yml
similarity index 100%
rename from platon.yml
rename to host-platon.yml
diff --git a/pottwal.yml b/host-pottwal.yml
similarity index 100%
rename from pottwal.yml
rename to host-pottwal.yml
diff --git a/radon.yml b/host-radon.yml
similarity index 100%
rename from radon.yml
rename to host-radon.yml
diff --git a/tau.yml b/host-tau.yml
similarity index 100%
rename from tau.yml
rename to host-tau.yml
diff --git a/unicorn.yml b/host-unicorn.yml
similarity index 100%
rename from unicorn.yml
rename to host-unicorn.yml
diff --git a/main.yml b/main.yml
index 27638fb..63e9faf 100644
--- a/main.yml
+++ b/main.yml
@@ -2,31 +2,31 @@
 # main playbook aggregating all the other playbooks
 
 - name: Setup for all hosts
-  import_playbook: all.yml
+  import_playbook: group-all.yml
 
 - name: Specific setup for all proxmox hosts
-  import_playbook: proxmox.yml
+  import_playbook: group-proxmox.yml
 
 - name: Tau specific setup
-  import_playbook: tau.yml
+  import_playbook: host-tau.yml
 
 - name: Pottwal specific setup
-  import_playbook: pottwal.yml
+  import_playbook: host-pottwal.yml
 
 - name: Specific setup for host unicorn
-  import_playbook: unicorn.yml
+  import_playbook: host-unicorn.yml
 
 - name: Platon specific setup
-  import_playbook: platon.yml
+  import_playbook: host-platon.yml
 
 - name: Radon specific setup
-  import_playbook: radon.yml
+  import_playbook: host-radon.yml
 
 - name: Krypton specific setup
-  import_playbook: krypton.yml
+  import_playbook: host-krypton.yml
 
 - name: Oganesson specific setup
-  import_playbook: oganesson.yml
+  import_playbook: host-oganesson.yml
 
 - name: Holmium specific setup
-  import_playbook: holmium.yml
+  import_playbook: host-holmium.yml