diff --git a/apt/map.jinja b/apt/map.jinja
index 1e23205..ed3091c 100644
--- a/apt/map.jinja
+++ b/apt/map.jinja
@@ -35,4 +35,12 @@
           },
         },
     },
-}, merge=salt['pillar.get']('apt:lookup'), default='Debian') %}
+}, merge=salt['grains.filter_by']({
+}, grain='oscodename', merge=salt['grains.filter_by']({
+    'Ubuntu': {
+         'keyring_package': 'ubuntu-keyring'
+    },
+    'Mint': {
+         'keyring_package': 'linuxmint-keyring'
+    },
+}, merge=salt['pillar.get']('apt:lookup'), default='Debian'))) %}