diff --git a/bundles/zfs/items.py b/bundles/zfs/items.py
index e00feb0..40ac354 100644
--- a/bundles/zfs/items.py
+++ b/bundles/zfs/items.py
@@ -46,20 +46,20 @@ files = {
     '/usr/local/sbin/zfs-auto-snapshot': {
         'mode': '0755',
     },
-    '/usr/lib/nagios/plugins/check_zfs_auto_snapshot': {
+    '/usr/local/share/icinga/plugins/check_zfs_auto_snapshot': {
         'mode': '0755',
     },
-    '/usr/lib/nagios/plugins/check_zfs_old_snapshots': {
+    '/usr/local/share/icinga/plugins/check_zfs_old_snapshots': {
         'mode': '0755',
     },
-    "/usr/lib/nagios/plugins/check_zfs_volumes": {
+    "/usr/local/share/icinga/plugins/check_zfs_volumes": {
         'mode': '0755',
         'content_type': 'mako',
     },
-    "/usr/lib/nagios/plugins/check_zpool_online": {
+    "/usr/local/share/icinga/plugins/check_zpool_online": {
         'mode': '0755',
     },
-    "/usr/lib/nagios/plugins/check_zpool_space": {
+    "/usr/local/share/icinga/plugins/check_zpool_space": {
         'mode': '0755',
     },
 }
diff --git a/bundles/zfs/metadata.py b/bundles/zfs/metadata.py
index 4b26161..771c60c 100644
--- a/bundles/zfs/metadata.py
+++ b/bundles/zfs/metadata.py
@@ -72,11 +72,14 @@ if node.has_bundle('sshmon'):
             'zfs': {
                 'services': {
                     'ZFS AUTO SNAPSHOT': {
-                        'command_on_monitored_host': '/usr/lib/nagios/plugins/check_zfs_auto_snapshot',
+                        'command_on_monitored_host': '/usr/local/share/icinga/plugins/check_zfs_auto_snapshot',
                     },
                     'ZFS MOUNTED VOLUMES': {
-                        'command_on_monitored_host': '/usr/lib/nagios/plugins/check_zfs_volumes',
+                        'command_on_monitored_host': '/usr/local/share/icinga/plugins/check_zfs_volumes',
                     },
+                    'ZFS OLD SNAPSHOTS': {
+                        'command_on_monitored_host': 'sudo /usr/local/share/icinga/plugins/check_zfs_old_snapshots',
+                    }
                 },
             },
         },
@@ -143,18 +146,13 @@ def monitoring(metadata):
 
     for poolname, pool_options in metadata.get('zfs/pools').items():
         services['ZFS ZPOOL ONLINE {}'.format(poolname)] = {
-            'command_on_monitored_host': 'sudo /usr/lib/nagios/plugins/check_zpool_online {}'.format(poolname),
+            'command_on_monitored_host': 'sudo /usr/local/share/icinga/plugins/check_zpool_online {}'.format(poolname),
         }
 
         services['ZFS ZPOOL SPACE ' + poolname] = {
-            'command_on_monitored_host': 'sudo /usr/lib/nagios/plugins/check_zpool_space {} 90'.format(poolname)
+            'command_on_monitored_host': 'sudo /usr/local/share/icinga/plugins/check_zpool_space {} 90'.format(poolname)
         }
 
-
-    services['ZFS OLD SNAPSHOTS'] = {
-        'command_on_monitored_host': 'sudo /usr/lib/nagios/plugins/check_zfs_old_snapshots',
-    }
-
     return {
         'icinga2_api': {
             'zfs': {