diff --git a/modules/desktop/manifests/init.pp b/modules/desktop/manifests/init.pp
index 67b5d4490ccae5e552f4423791fa9bd0bcdca110..53bdc7956963a66e521413a127e32e0930008990 100644
--- a/modules/desktop/manifests/init.pp
+++ b/modules/desktop/manifests/init.pp
@@ -124,11 +124,6 @@ class desktop {
 		'fonts-crosextra-carlito',
 		'fonts-crosextra-caladea',
                 'florence',
-                'avahi-utils',
-                'avahi-daemon',
-                'libnss-mdns',
-                'cups',
-                'hplip',
 
 	]
   
diff --git a/modules/system/manifests/init.pp b/modules/system/manifests/init.pp
index 9f03e7020fb84a33f7bc4a9fd239994d28182ec1..866eb0e93ffa3bdee4ec9bf129723b51db786ae0 100644
--- a/modules/system/manifests/init.pp
+++ b/modules/system/manifests/init.pp
@@ -59,6 +59,11 @@ class system {
 		'libpam-tmpdir',
 		'broadcom-sta-dkms',
 		'firmware-iwlwifi',
+		'avahi-utils',
+		'avahi-daemon',
+		'libnss-mdns',
+		'cups',
+		'hplip',
 	]
   
 	package { $packages: