diff --git a/playbook_lime2.yml b/playbook_lime2.yml
index a98dd25..af59385 100644
--- a/playbook_lime2.yml
+++ b/playbook_lime2.yml
@@ -4,7 +4,7 @@
 
 - name: Install services for lime2 home server
   gather_facts: true
-  hosts: lime2,lime2-test
+  hosts: lime2servers
   roles:
     - role: common_handlers
       tags: always
diff --git a/playbook_mailserver.yml b/playbook_mailserver.yml
index 4dd6e59..972dee6 100644
--- a/playbook_mailserver.yml
+++ b/playbook_mailserver.yml
@@ -4,7 +4,7 @@
 
 - name: Install mail server
   gather_facts: true
-  hosts: mailserver,mailserver-test
+  hosts: mailservers
   roles:
     - role: common_handlers
       tags: always