diff --git a/glance/meta/sensu.yml b/glance/meta/sensu.yml
index 7849b42..7cf26dc 100644
--- a/glance/meta/sensu.yml
+++ b/glance/meta/sensu.yml
@@ -1,3 +1,4 @@
+{%- from "glance/map.jinja" import server with context %}
 check:
   local_glance_api_proc:
     command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C glance-api -u glance -c 1:20"
@@ -12,20 +13,20 @@
     subscribers:
     - local-glance-server
   remote_openstack_glance_api:
-    command: "PATH=$PATH:/usr/local/bin oschecks-check_glance_api --os_auth_url='http://:::openstack.host::::5000/v2.0' --os_username=:::openstack.user::: --os_password=':::openstack.password:::' --os_tenant_name=:::openstack.tenant::: --os-region-name {{ controller.identity.region }}"
+    command: "PATH=$PATH:/usr/local/bin oschecks-check_glance_api --os_auth_url='http://:::openstack.host::::5000/v2.0' --os_username=:::openstack.user::: --os_password=':::openstack.password:::' --os_tenant_name=:::openstack.tenant::: --os-region-name {{ server.identity.region }}"
     interval: 60
     occurrences: 1
     subscribers:
     - remote-network
   remote_openstack_glance_image_exists:
-    command: "PATH=$PATH:/usr/local/bin oschecks-check_glance_image_exists --os_auth_url='http://:::openstack.host::::5000/v2.0' --os_username=:::openstack.user::: --os_password=':::openstack.password:::' --os_tenant_name=:::openstack.tenant::: --os-region-name {{ controller.identity.region }}"
+    command: "PATH=$PATH:/usr/local/bin oschecks-check_glance_image_exists --os_auth_url='http://:::openstack.host::::5000/v2.0' --os_username=:::openstack.user::: --os_password=':::openstack.password:::' --os_tenant_name=:::openstack.tenant::: --os-region-name {{ server.identity.region }}"
     interval: 120
     occurrences: 1
     subscribers:
     - remote-network
   remote_openstack_glance_upload:
-    command: "PATH=$PATH:/usr/local/bin oschecks-check_glance_upload --os_auth_url='http://:::openstack.host::::5000/v2.0' --os_username=:::openstack.user::: --os_password=':::openstack.password:::' --os_tenant_name=:::openstack.tenant:::  --os-region-name {{ controller.identity.region }}"
+    command: "PATH=$PATH:/usr/local/bin oschecks-check_glance_upload --os_auth_url='http://:::openstack.host::::5000/v2.0' --os_username=:::openstack.user::: --os_password=':::openstack.password:::' --os_tenant_name=:::openstack.tenant:::  --os-region-name {{ server.identity.region }}"
     interval: 300
     occurrences: 1
     subscribers:
-    - remote-network
\ No newline at end of file
+    - remote-network