diff --git a/nfs/map.jinja b/nfs/map.jinja
index 7062a6a..24ef1d3 100644
--- a/nfs/map.jinja
+++ b/nfs/map.jinja
@@ -5,6 +5,7 @@
 {% import_yaml 'nfs/defaults.yaml' as defaults %}
 {% import_yaml 'nfs/osfamilymap.yaml' as osfamilymap %}
 {% import_yaml 'nfs/osmap.yaml' as osmap %}
+{% import_yaml 'nfs/osfingermap.yaml' as osfingermap %}
 
 {% set nfs = salt['grains.filter_by'](
     defaults,
@@ -14,7 +15,10 @@
         merge = salt['grains.filter_by'](
             osmap,
             grain='os',
-            merge = salt['pillar.get']('nfs', {}),
+            merge = salt['grains.filter_by'](
+                osfingermap,
+                merge = salt['pillar.get']('nfs', {}),
+            ),
         ),
     ),
     base='nfs')
diff --git a/nfs/osfingermap.yaml b/nfs/osfingermap.yaml
new file mode 100644
index 0000000..467cbd5
--- /dev/null
+++ b/nfs/osfingermap.yaml
@@ -0,0 +1,2 @@
+Debian-8:
+  service_name: 'nfs-kernel-server'