diff --git a/lldp/client.sls b/lldp/client.sls
index 132f702..e091d35 100644
--- a/lldp/client.sls
+++ b/lldp/client.sls
@@ -7,11 +7,9 @@
   pkg.installed:
   - name: lldpd
 
-
-{%- if grains.lsb_distrib_codename == "trusty" %}
-/etc/default/lldpd:
+{{ client.configpath }}:
   file.managed:
-  - source: salt://lldp/files/lldpd
+  - source: salt://lldp/files/{{ client.configfile }}
   - template: jinja
   - require:
     - pkg: lldp_packages
@@ -20,25 +18,8 @@
   - enable: true
   - name: {{ client.service }}
   - watch:
-    - file: /etc/default/lldpd
+    - file: {{ client.configpath }}
 
 {%- endif %}
-
-{%- if grains.lsb_distrib_codename == "xenial" %}
-/etc/lldpd.d/interfaces.conf:
-  file.managed:
-  - source: salt://lldp/files/interfaces.conf
-  - template: jinja
-  - require:
-    - pkg: lldp_packages
-lldp_service:
-  service.running:
-  - enable: true
-  - name: {{ client.service }}
-  - watch:
-    - file: /etc/lldpd.d/interfaces.conf
-
-{%- endif %}
-{%- endif %}
 {%- endif %}
 {%- endif %}
diff --git a/lldp/map.jinja b/lldp/map.jinja
index 1f093c9..e176a77 100644
--- a/lldp/map.jinja
+++ b/lldp/map.jinja
@@ -2,4 +2,13 @@
     'Debian': {
         'service': 'lldpd',
     },
-}, merge=pillar.lldp.get('client', {})) %}
+}, merge=salt['grains.filter_by']({
+    'trusty': {
+        'configpath': '/etc/default/lldpd',
+        'configfile': 'lldpd',
+    },
+    'xenial': {
+        'configpath': '/etc/lldpd.d/interfaces.conf',
+        'configfile': 'interfaces.conf',
+    },
+}, grain='oscodename', merge=pillar.lldp.get('client', {}))) %}