diff --git a/firewall.yml b/firewall.yml
index c52aa4a..35e6827 100644
--- a/firewall.yml
+++ b/firewall.yml
@@ -1,4 +1,4 @@
-- hosts: all:!baybay-ponay.mateu.be:!machinbox.mateu.be:!muse-macbookair.lan
+- hosts: all:!baybay-ponay.mateu.be:!machinbox.mateu.be:!muse-HP-EliteBook-820-G2.home.arpa
   tasks: []
 - hosts: router
   diff: yes
diff --git a/munin.yml b/munin.yml
index e8eeb3d..34ef44b 100644
--- a/munin.yml
+++ b/munin.yml
@@ -1,4 +1,4 @@
-- hosts: all:!baybay-ponay.mateu.be:!muse-macbookair.lan
+- hosts: all:!baybay-ponay.mateu.be:!muse-HP-EliteBook-820-G2.home.arpa
   diff: yes
   roles:
       - munin-client
diff --git a/production/hosts b/production/hosts
index b643255..2a9295a 100644
--- a/production/hosts
+++ b/production/hosts
@@ -17,7 +17,7 @@ borg_client
 edelgard.dmz.mateu.be
 
 [borg_client]
-muse-macbookair.lan borg_backup_path="['/home', '/etc']" borg_backup_hour=21 borg_backup_minute=0
+muse-HP-EliteBook-820-G2.home.arpa borg_backup_path="['/home', '/etc']" borg_backup_hour=21 borg_backup_minute=0
 baybay-ponay.mateu.be borg_backup_path="['/home', '/etc']" borg_backup_excluded_path="['/home/.snapshots']" borg_backup_hour=19 borg_backup_minute=30
 bt.dmz.mateu.be borg_backup_path="['/etc', '/var/lib/transmission-daemon']"
 web1.dmz.mateu.be
@@ -89,7 +89,7 @@ munin.dmz.mateu.be
 
 [disabled_munin]
 baybay-ponay.mateu.be
-muse-macbookair.lan
+muse-HP-EliteBook-820-G2.home.arpa
 
 [unifiservers]
 unifi.dmz.mateu.be
diff --git a/smtprelay.yml b/smtprelay.yml
index 3b1fec9..1002b72 100644
--- a/smtprelay.yml
+++ b/smtprelay.yml
@@ -1,4 +1,4 @@
-- hosts: all:!baybay-ponay.mateu.be:!machinbox.mateu.be:!mail.dmz.mateu.be:!muse-macbookair.lan
+- hosts: all:!baybay-ponay.mateu.be:!machinbox.mateu.be:!mail.dmz.mateu.be:!muse-HP-EliteBook-820-G2.home.arpa
   diff: yes
   roles:
     - smtprelay
diff --git a/syslog.yml b/syslog.yml
index 7fad0b7..c268cc4 100644
--- a/syslog.yml
+++ b/syslog.yml
@@ -1,4 +1,4 @@
-- hosts: all:!baybay-ponay.mateu.be:!machinbox.mateu.be:!muse-macbookair.lan
+- hosts: all:!baybay-ponay.mateu.be:!machinbox.mateu.be:!muse-HP-EliteBook-820-G2.home.arpa
   diff: yes
   roles:
       - rsyslog
diff --git a/system.yml b/system.yml
index cb861c1..828a7c8 100644
--- a/system.yml
+++ b/system.yml
@@ -1,4 +1,4 @@
-- hosts: all:!baybay-ponay.mateu.be:!machinbox.mateu.be:!muse-macbookair.lan
+- hosts: all:!baybay-ponay.mateu.be:!machinbox.mateu.be:!muse-HP-EliteBook-820-G2.home.arpa
   diff: yes
   roles:
     - system