diff --git a/glusterfs/meta/sensu.yml b/glusterfs/meta/sensu.yml
index 353de55..a7d4a2e 100644
--- a/glusterfs/meta/sensu.yml
+++ b/glusterfs/meta/sensu.yml
@@ -1,15 +1,14 @@
-{%- from "linux/map.jinja" import network with context -%}
 {%- from "glusterfs/map.jinja" import server with context -%}
 {%- if pillar.glusterfs.server is defined %}
 check:
 {%- for volume_name, volume in server.get('volumes', {}).iteritems() %}
-  local_glusterfs_status_{{ volume_name }}:
+  local_glusterfs_volume_{{ volume_name }}_{{ grains['fqdn'] }}:
     command: "PATH=$PATH:/etc/sensu/plugins check_glusterfs -v {{ volume_name }} -n {{ volume.bricks|length }} -w 5 -c 1"
     {%- set interval=320+(loop.index*5) %}
     interval: {{ interval }}
     timeout: 120
     occurrences: 1
     subscribers:
-    - local-glusterfs-server
+    - {{ grains['fqdn']|replace('.', '-') }}
 {%- endfor %}
 {%- endif %}