diff --git a/glusterfs/meta/sensu.yml b/glusterfs/meta/sensu.yml
index 1bfc35f..77521bf 100644
--- a/glusterfs/meta/sensu.yml
+++ b/glusterfs/meta/sensu.yml
@@ -1,5 +1,6 @@
 {%- 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 in server.get('volumes', {}).iterkeys() %}
   local_glusterfs_status_{{ network.fqdn }}::
@@ -8,4 +9,5 @@
     occurrences: 1
     subscribers:
     - local-glusterfs-server
-{%- endfor %}
\ No newline at end of file
+{%- endfor %}
+{%- endif %}
diff --git a/metadata/service/client.yml b/metadata/service/client.yml
index 86b98fc..4910515 100644
--- a/metadata/service/client.yml
+++ b/metadata/service/client.yml
@@ -1,5 +1,7 @@
 applications:
   - glusterfs
+classes:
+  - service.glusterfs.support
 parameters:
   glusterfs:
     client:
diff --git a/metadata/service/server.yml b/metadata/service/server.yml
index 136148d..ead5cb7 100644
--- a/metadata/service/server.yml
+++ b/metadata/service/server.yml
@@ -1,5 +1,7 @@
 applications:
   - glusterfs
+classes:
+  - service.glusterfs.support
 parameters:
   glusterfs:
     server: