diff --git a/cinder/meta/prometheus.yml b/cinder/meta/prometheus.yml
index 35e5ea8..3902d26 100644
--- a/cinder/meta/prometheus.yml
+++ b/cinder/meta/prometheus.yml
@@ -9,7 +9,7 @@
 {%- raw %}
     CinderAPIDown:
       if: >-
-        max(openstack_api_check_status{service=~"cinder.+"}) by (service) == 0
+        max(openstack_api_check_status{service=~"cinder.*"}) by (service) == 0
       for: 2m
       labels:
         severity: down
@@ -20,7 +20,7 @@
             Endpoint check for '{{ $labels.service }}' is down for 2 minutes
     CinderSomeServicesDown:
       if: >-
-          openstack_cinder_services{state="down",service="cinder-volume|cinder-scheduler"} > 0 and ignoring (state) openstack_cinder_services{state="up",services="cinder-volume|cinder-scheduler"} >= 2
+          openstack_cinder_services{state="down",service=~"cinder-volume|cinder-scheduler"} > 0 and ignoring (state) openstack_cinder_services{state="up",service=~"cinder-volume|cinder-scheduler"} >= 2
       for: 2m
       labels:
         severity: warning
@@ -31,7 +31,7 @@
             {{ $value }} {{ $labels.service }} services are down for 2 minutes
     CinderOnlyOneServiceUp:
       if: >-
-          openstack_cinder_services{state="up",service="cinder-volume|cinder-scheduler"} == 1 and ignoring (state) openstack_cinder_services{state="down",service="cinder-volume|cinder-scheduler"} > 0
+          openstack_cinder_services{state="up",service=~"cinder-volume|cinder-scheduler"} == 1 and ignoring (state) openstack_cinder_services{state="down",service=~"cinder-volume|cinder-scheduler"} > 0
       for: 2m
       labels:
         severity: critical
@@ -42,7 +42,7 @@
             Only one {{ $labels.service }} service is up for 2 minutes
     CinderAllServicesDown:
       if: >-
-        openstack_cinder_services{state="up",service="cinder-volume|cinder-scheduler"} == 0
+        openstack_cinder_services{state="up",service=~"cinder-volume|cinder-scheduler"} == 0
       for: 2m
       labels:
         severity: down