diff --git a/pillar/top.sls b/pillar/top.sls
index 9f21a2c99..53ec8a330 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -2,6 +2,8 @@ base:
   '*':
     - global.soc_global
     - global.adv_global
+    - docker.soc_docker
+    - docker.adv_docker
     - influxdb.token
     - logrotate.soc_logrotate
     - logrotate.adv_logrotate
@@ -16,8 +18,6 @@ base:
     - telegraf.adv_telegraf
 
   '* and not *_desktop':
-    - docker.soc_docker
-    - docker.adv_docker
     - firewall.soc_firewall
     - firewall.adv_firewall
     - nginx.soc_nginx
diff --git a/salt/top.sls b/salt/top.sls
index ccad30307..e278635b5 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -29,13 +29,10 @@ base:
     - salt.minion-check
     - salt.lasthighstate
     - common
+    - docker
     - sensoroni
     - telegraf
 
-  'not *_desktop and G@saltversion:{{saltversion}}':
-    - match: compound
-    - docker
-
   '*_sensor and G@saltversion:{{saltversion}}':
     - match: compound
     - sensor