diff --git a/cinder/files/sensu.conf b/cinder/files/sensu.conf
index 8035dd9..645d92c 100644
--- a/cinder/files/sensu.conf
+++ b/cinder/files/sensu.conf
@@ -17,13 +17,13 @@
   subscribers:
   - local-cinder-volume
 remote_openstack_cinder_api:
-  command: 'PATH=$PATH:/usr/local/bin oschecks-check_cinder_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_cinder_api --os_auth_url='http://:::openstack.host:::::::openstack.port:::/v2.0' --os_username=:::openstack.user::: --os_password=":::openstack.password:::" --os_tenant_name=:::openstack.tenant"
   interval: 60
   occurrences: 1
   subscribers:
   - remote-network
 remote_openstack_cinder_volume:
-  command: 'PATH=$PATH:/usr/local/bin oschecks-check_cinder_volume --auth_url="http://:::openstack.host::::5000/v2.0" --username :::openstack.user::: --password :::openstack.password::: --tenant :::openstack.tenant:::'
+  command: "PATH=$PATH:/usr/local/bin oschecks-check_cinder_volume --auth_url='http://:::openstack.host:::::::openstack.port:::/v2.0' --username :::openstack.user::: --password :::openstack.password::: --tenant :::openstack.tenant:::"
   interval: 300
   occurrences: 1
   subscribers: