diff --git a/roles/2-common/tasks/packages.yml b/roles/2-common/tasks/packages.yml
index e409b5dee..3dc470753 100644
--- a/roles/2-common/tasks/packages.yml
+++ b/roles/2-common/tasks/packages.yml
@@ -36,6 +36,9 @@
    - linux-firmware
    - syslog
    - xml-common
+   - nss-mdns
+   - avahi
+   - avahi-tools
   when: is_redhat
 
 - name: Download usbmount -- not in debian-9
@@ -52,6 +55,9 @@
   with_items:
     - inetutils-syslogd
     - wpasupplicant
+    - libnss-mdns
+    - avahi-daemon
+    - avahi-discover
   when: is_debuntu
 
 - name: Install common packages
diff --git a/roles/network/tasks/avahi.yml b/roles/network/tasks/avahi.yml
index 517ddb808..0801a477f 100644
--- a/roles/network/tasks/avahi.yml
+++ b/roles/network/tasks/avahi.yml
@@ -1,25 +1,3 @@
-- name: Install avahi package
-  package: name={{ item }}
-           state=present
-  with_items:
-   - libnss-mdns
-   - avahi-daemon
-   - avahi-discover
-  when: is_debuntu
-  tags:
-    - download
-
-- name: Install avahi package
-  package: name={{ item }}
-           state=present
-  with_items:
-   - nss-mdns
-   - avahi
-   - avahi-tools
-  when: not is_debuntu
-  tags:
-    - download
-
 - name: Create a user for avahi
   user: name=avahi
         createhome=no