diff --git a/salt/pillars/top.sls b/salt/pillars/top.sls
index 8dfce2f..9db098a 100644
--- a/salt/pillars/top.sls
+++ b/salt/pillars/top.sls
@@ -4,5 +4,7 @@ base:
     - packages
     - repositories
 
-  'exsilio':
-    - hosts.exsilio
+{% if salt['file.file_exists']('hosts/{0}.sls'.format(grains.id)) %}
+  '{{ grains.id }}':
+     - hosts.{{ grains.id }}
+{% endif %}