diff --git a/glance/files/sensu.conf b/glance/files/sensu.conf
deleted file mode 100644
index 095a3c1..0000000
--- a/glance/files/sensu.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-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"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - local-glance-server
-local_glance_registry_proc:
-  command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C glance-registry -u glance -c 1:10"
-  interval: 60
-  occurrences: 1
-  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:::'
-  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:::'
-  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:::'
-  interval: 300
-  occurrences: 1
-  subscribers:
-  - remote-network
\ No newline at end of file
diff --git a/glance/meta/sensu.yml b/glance/meta/sensu.yml
index cbe9ffc..ebc15c8 100644
--- a/glance/meta/sensu.yml
+++ b/glance/meta/sensu.yml
@@ -12,19 +12,19 @@
     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:::'
+    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:::'
     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:::'
+    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:::'
     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:::'
+    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:::'
     interval: 300
     occurrences: 1
     subscribers: