diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Neutron.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Neutron.json
index 0221f89a..019855e1 100644
--- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Neutron.json
+++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Neutron.json
@@ -3567,11 +3567,13 @@
                 },
                 {
                   "key": "owner",
+                  "operator": "=",
                   "value": "compute"
                 },
                 {
                   "condition": "AND",
                   "key": "state",
+                  "operator": "=",
                   "value": "active"
                 }
               ]
@@ -3640,6 +3642,12 @@
                   ],
                   "type": "time"
                 },
+                {
+                  "params": [
+                    "owner"
+                  ],
+                  "type": "tag"
+                },
                 {
                   "params": [
                     "0"
@@ -3863,6 +3871,12 @@
                   ],
                   "type": "time"
                 },
+                {
+                  "params": [
+                    "state"
+                  ],
+                  "type": "tag"
+                },
                 {
                   "params": [
                     "0"
@@ -4084,6 +4098,12 @@
                   ],
                   "type": "time"
                 },
+                {
+                  "params": [
+                    "state"
+                  ],
+                  "type": "tag"
+                },
                 {
                   "params": [
                     "0"
@@ -4233,4 +4253,4 @@
   "timezone": "browser",
   "title": "Neutron",
   "version": 2
-}
+}
\ No newline at end of file