diff --git a/roles/do1jlr.avahi_client b/roles/do1jlr.avahi_client
index 00b8f33..4c67cea 160000
--- a/roles/do1jlr.avahi_client
+++ b/roles/do1jlr.avahi_client
@@ -1 +1 @@
-Subproject commit 00b8f33203d31d989b4f23420a4e9bf6f543691d
+Subproject commit 4c67ceabec6813608bce17dd261355f135ae41c4
diff --git a/roles/do1jlr.avahi_daemon b/roles/do1jlr.avahi_daemon
index 2bf6faa..ba85ed6 160000
--- a/roles/do1jlr.avahi_daemon
+++ b/roles/do1jlr.avahi_daemon
@@ -1 +1 @@
-Subproject commit 2bf6faadaebf327c85a3e2157685f918980ce473
+Subproject commit ba85ed6d38da5971688f65265880bdaa186fd902
diff --git a/setup_desk_minni.yml b/setup_desk_minni.yml
index 942aaba..88b2742 100644
--- a/setup_desk_minni.yml
+++ b/setup_desk_minni.yml
@@ -34,3 +34,5 @@
     - {role: arch-fonts, tags: fonts}
     - {role: winehq, tags: wine}
     - {role: no-sleep, tags: sleep}
+    - {role: do1jlr.avahi_daemon, tags: [avahi_daemon, avahi]}
+    - {role: do1jlr.avahi_client, tags: [avahi_client, mdns]}
diff --git a/setup_l14.yml b/setup_l14.yml
index eab3849..3c5ab24 100644
--- a/setup_l14.yml
+++ b/setup_l14.yml
@@ -35,3 +35,5 @@
     - {role: arch-fonts, tags: fonts}
     - {role: winehq, tags: wine}
     - {role: no-sleep, tags: sleep}
+    - {role: do1jlr.avahi_daemon, tags: [avahi_daemon, avahi]}
+    - {role: do1jlr.avahi_client, tags: [avahi_client, mdns]}
diff --git a/setup_t460p.yml b/setup_t460p.yml
index 1e86001..948a0f5 100644
--- a/setup_t460p.yml
+++ b/setup_t460p.yml
@@ -39,3 +39,5 @@
     - {role: arch-fonts, tags: fonts}
     - {role: winehq, tags: wine}
     - {role: no-sleep, tags: sleep}
+    - {role: do1jlr.avahi_daemon, tags: [avahi_daemon, avahi]}
+    - {role: do1jlr.avahi_client, tags: [avahi_client, mdns]}
diff --git a/setup_workstation.yml b/setup_workstation.yml
index fbc0db9..23180e9 100644
--- a/setup_workstation.yml
+++ b/setup_workstation.yml
@@ -4,12 +4,6 @@
   roles:
     - {role: ansible_version, tags: always, gather_facts: false}
 
-- name: avahi
-  hosts: workstation.local
-  roles:
-    - {role: do1jlr.avahi_daemon, tags: [avahi_daemon, avahi]}
-    - {role: do1jlr.avahi_client, tags: [avahi_client, mdns]}
-
 - name: base packages setup
   hosts: workstation.local
   roles:
@@ -40,3 +34,5 @@
     - {role: arch-fonts, tags: fonts}
     - {role: winehq, tags: wine}
     - {role: no-sleep, tags: sleep}
+    - {role: do1jlr.avahi_daemon, tags: [avahi_daemon, avahi]}
+    - {role: do1jlr.avahi_client, tags: [avahi_client, mdns]}