diff --git a/heat/files/grafana_dashboards/heat_prometheus.json b/heat/files/grafana_dashboards/heat_prometheus.json
index 3c09680..9fb8a53 100644
--- a/heat/files/grafana_dashboards/heat_prometheus.json
+++ b/heat/files/grafana_dashboards/heat_prometheus.json
@@ -71,7 +71,7 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "min(openstack_api_check_status{service=~\"heat.*\"})",
+              "expr": "openstack_api_check_status{interface=\"public\",service_name=\"heat\"}",
               "format": "time_series",
               "intervalFactor": 2,
               "refId": "A",
@@ -79,7 +79,7 @@
             }
           ],
           "thresholds": "0.5,1.5",
-          "title": "API availability",
+          "title": "Public VIP API Availability",
           "type": "singlestat",
           "valueFontSize": "80%",
           "valueMaps": [
diff --git a/heat/files/grafana_dashboards/heat_prometheus_fluentd.json b/heat/files/grafana_dashboards/heat_prometheus_fluentd.json
index c44a5f1..27c9b1d 100644
--- a/heat/files/grafana_dashboards/heat_prometheus_fluentd.json
+++ b/heat/files/grafana_dashboards/heat_prometheus_fluentd.json
@@ -97,14 +97,14 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "min(openstack_api_check_status{name=\"heat\"})",
+          "expr": "openstack_api_check_status{interface=\"public\",service_name=\"heat\"}",
           "format": "time_series",
           "intervalFactor": 2,
           "refId": "A"
         }
       ],
       "thresholds": "0.5,0.5",
-      "title": "VIP API availability",
+      "title": "Public VIP API Availability",
       "type": "singlestat",
       "valueFontSize": "80%",
       "valueMaps": [
diff --git a/heat/meta/grafana.yml b/heat/meta/grafana.yml
index 05bd42d..a766855 100644
--- a/heat/meta/grafana.yml
+++ b/heat/meta/grafana.yml
@@ -44,7 +44,7 @@
               type: dashboard
             target:
               cluster_status:
-                expr: avg(openstack_api_check_status{service=~"heat.*"})
+                expr: openstack_api_check_status{interface="public",service_name="heat"}
   service_level:
     datasource: influxdb
     row:
diff --git a/heat/meta/prometheus.yml b/heat/meta/prometheus.yml
index 48be8c2..a0d69f0 100644
--- a/heat/meta/prometheus.yml
+++ b/heat/meta/prometheus.yml
@@ -6,26 +6,6 @@
 {% raw %}
 server:
   alert:
-    HeatApiDown:
-      if: >-
-        openstack_api_check_status{name=~"heat.*"} == 0
-      labels:
-        severity: major
-        service: heat
-      annotations:
-        summary: "{{ $labels.name }} endpoint is not accessible"
-        description: >-
-          Heat API is not accessible for the {{ $labels.name }} endpoint.
-    HeatApiOutage:
-      if: >-
-        max(openstack_api_check_status{name=~"heat.*"}) == 0
-      labels:
-        severity: critical
-        service: heat
-      annotations:
-        summary: "Heat API outage"
-        description: >-
-          Heat API is not accessible for all available Heat endpoints in the OpenStack service catalog.
     HeatApiEndpointDown:
       if: >-
         http_response_status{name=~"heat.*-api"} == 0