diff --git a/salt/cloud.sls b/salt/cloud.sls
index 41c753bfe1922907bd074f6febbe0ea20855a64a..be62f5d5b2598b80be1904e54011338a08052152 100644
--- a/salt/cloud.sls
+++ b/salt/cloud.sls
@@ -1,4 +1,4 @@
-{% from "salt/package-map.jinja" import pkgs with context %}
+{% from "salt/map.jinja" import pkgs with context %}
 {% set salt = pillar.get('salt', {}) -%}
 {% set cloud = salt.get('cloud', {}) -%}
 
diff --git a/salt/package-map.jinja b/salt/map.jinja
similarity index 89%
rename from salt/package-map.jinja
rename to salt/map.jinja
index 770de38a0fd87cfa8eaa83b1db683e9701aab214..e342330a0ce54657270848a3554d754c202703ae 100644
--- a/salt/package-map.jinja
+++ b/salt/map.jinja
@@ -1,4 +1,4 @@
-{% set package_table = {
+{% set pkgs = salt['grains.filter_by']({
     'Debian':  {'salt-master': 'salt-master',
                 'salt-minion': 'salt-minion',
                 'salt-syndic': 'salt-syndic',
@@ -48,11 +48,6 @@
                 'config-path': '/usr/local/etc/salt',
                 'minion-service': 'salt_minion',
                 'master-service': 'salt_master',
-                'syndic-service': 'salt_syndic'}
-} %}
-
-{% if 'package_table' in pillar %}
-    {% set pkgs = pillar['package_table'] %}
-{% elif grains['os'] in package_table %}
-    {% set pkgs = package_table[grains['os']] %}
-{% endif %}
+                'syndic-service': 'salt_syndic'},
+},
+merge=salt['pillar.get']('salt:lookup'), base='default') %}
diff --git a/salt/master.sls b/salt/master.sls
index baa2e2b289a0ecd18bd3574192d848734e0b7ee6..2cb3bd040d7f7f579ec86e5eeec4944608b21891 100644
--- a/salt/master.sls
+++ b/salt/master.sls
@@ -1,4 +1,4 @@
-{% from "salt/package-map.jinja" import pkgs with context %}
+{% from "salt/map.jinja" import pkgs with context %}
 
 salt-master:
   pkg.installed:
diff --git a/salt/minion.sls b/salt/minion.sls
index a80e210acebc08c83c748c8668e6e48b6a8a93d2..a33172fe72f4680d48e9a02d7d30d16297352fd1 100644
--- a/salt/minion.sls
+++ b/salt/minion.sls
@@ -1,4 +1,4 @@
-{% from "salt/package-map.jinja" import pkgs with context %}
+{% from "salt/map.jinja" import pkgs with context %}
 
 salt-minion:
   pkg.installed:
diff --git a/salt/ssh.sls b/salt/ssh.sls
index 2f6aecea99496412527713b11ebb72ce2fb81f72..e32f5ebb240d01997cdf84b97cb63fb716065ac8 100644
--- a/salt/ssh.sls
+++ b/salt/ssh.sls
@@ -1,4 +1,4 @@
-{% from "salt/package-map.jinja" import pkgs with context %}
+{% from "salt/map.jinja" import pkgs with context %}
 
 ensure salt-ssh is installed:
   pkg.installed:
diff --git a/salt/standalone.sls b/salt/standalone.sls
index e33da85ea66241709312451714e8977b7acf128a..e4a8cd24fca31272f246553c500682fd52db9b29 100644
--- a/salt/standalone.sls
+++ b/salt/standalone.sls
@@ -1,4 +1,4 @@
-{% from "salt/package-map.jinja" import pkgs with context %}
+{% from "salt/map.jinja" import pkgs with context %}
 
 salt-minion:
   pkg.installed:
diff --git a/salt/syndic.sls b/salt/syndic.sls
index 0804d981d5a98dc2acfa22f77d4288976824f99a..5af99e40bc135662a9eb28e4aace8960b30fe3ba 100644
--- a/salt/syndic.sls
+++ b/salt/syndic.sls
@@ -1,4 +1,4 @@
-{% from "salt/package-map.jinja" import pkgs with context %}
+{% from "salt/map.jinja" import pkgs with context %}
 
 include:
   - salt.master