diff --git a/pillar/top.sls b/pillar/top.sls
index 4893c44f9..bf28b6474 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -2,21 +2,23 @@ base:
   '*':
     - global.soc_global
     - global.adv_global
-    - docker.soc_docker
-    - docker.adv_docker
-    - firewall.soc_firewall
-    - firewall.adv_firewall
-    - influxdb.token
     - logrotate.soc_logrotate
     - logrotate.adv_logrotate
-    - nginx.soc_nginx
-    - nginx.adv_nginx
-    - node_data.ips
     - ntp.soc_ntp
     - ntp.adv_ntp
     - patch.needs_restarting
     - patch.soc_patch
     - patch.adv_patch
+
+  '* and not *_desktop':
+    - docker.soc_docker
+    - docker.adv_docker
+    - firewall.soc_firewall
+    - firewall.adv_firewall
+    - influxdb.token
+    - nginx.soc_nginx
+    - nginx.adv_nginx
+    - node_data.ips
     - sensoroni.soc_sensoroni
     - sensoroni.adv_sensoroni
     - telegraf.soc_telegraf