diff --git a/src/grafana_dashboards/kafka-metrics.json b/src/grafana_dashboards/kafka-metrics.json
index 086af13d..462b7c77 100644
--- a/src/grafana_dashboards/kafka-metrics.json
+++ b/src/grafana_dashboards/kafka-metrics.json
@@ -1069,7 +1069,7 @@
         "defaults": {
           "custom": {},
           "decimals": 2,
-          "displayName": "Broker: $broker",
+          "displayName": "Broker: $juju_unit",
           "mappings": [
             {
               "$$hashKey": "object:230",
@@ -1129,11 +1129,11 @@
       "repeatDirection": "h",
       "targets": [
         {
-          "expr": "100 - (kafka_network_socketserver_networkprocessoravgidlepercent{instance=~\"$broker\"}*100)",
+          "expr": "100 - (kafka_network_socketserver_networkprocessoravgidlepercent{juju_unit=\"$juju_unit\"}*100)",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "Network processor avg {{instance}}",
+          "legendFormat": "Network processor avg {{juju_unit}}",
           "refId": "A"
         }
       ],
@@ -1162,7 +1162,7 @@
         "defaults": {
           "custom": {},
           "decimals": 2,
-          "displayName": "Broker: $broker",
+          "displayName": "Broker: $juju_unit",
           "mappings": [
             {
               "$$hashKey": "object:230",
@@ -1226,11 +1226,11 @@
       "repeatDirection": "h",
       "targets": [
         {
-          "expr": "kafka_server_kafkarequesthandlerpool_requesthandleravgidlepercent_total{instance=~\"$broker\"}",
+          "expr": "kafka_server_kafkarequesthandlerpool_requesthandleravgidlepercent_total{juju_unit=\"$juju_unit\"}",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "Request handler avg {{instance}}",
+          "legendFormat": "Request handler avg {{juju_unit}}",
           "refId": "A"
         }
       ],
@@ -1316,7 +1316,7 @@
       "repeatDirection": "h",
       "targets": [
         {
-          "expr": "avg by(request) (kafka_network_requestmetrics_totaltimems{instance=~\"$broker\",quantile=\"0.99\",request=\"Produce\"})",
+          "expr": "avg by(request) (kafka_network_requestmetrics_totaltimems{juju_unit=\"$juju_unit\",quantile=\"0.99\",request=\"Produce\"})",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -1390,7 +1390,7 @@
       "repeatDirection": "h",
       "targets": [
         {
-          "expr": "avg by(request) (kafka_network_requestmetrics_totaltimems{instance=~\"$broker\",quantile=\"0.99\",request=\"FetchConsumer\"})",
+          "expr": "avg by(request) (kafka_network_requestmetrics_totaltimems{juju_unit=\"$juju_unit\",quantile=\"0.99\",request=\"FetchConsumer\"})",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -1464,7 +1464,7 @@
       "repeatDirection": "h",
       "targets": [
         {
-          "expr": "avg by(request) (kafka_network_requestmetrics_totaltimems{instance=~\"$broker\",quantile=\"0.99\",request=\"FetchFollower\"})",
+          "expr": "avg by(request) (kafka_network_requestmetrics_totaltimems{juju_unit=\"$juju_unit\",quantile=\"0.99\",request=\"FetchFollower\"})",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -1533,11 +1533,11 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg by(instance) (kafka_network_requestmetrics_totaltimems{instance=~\"$broker\",quantile=\"0.99\",request=\"Produce\"})",
+          "expr": "avg by(juju_unit) (kafka_network_requestmetrics_totaltimems{juju_unit=\"$juju_unit\",quantile=\"0.99\",request=\"Produce\"})",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "{{instance}}",
+          "legendFormat": "{{juju_unit}}",
           "refId": "D"
         }
       ],
@@ -1638,11 +1638,11 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg by(instance) (kafka_network_requestmetrics_totaltimems{instance=~\"$broker\",quantile=\"0.99\",request=\"FetchConsumer\"})",
+          "expr": "avg by(juju_unit) (kafka_network_requestmetrics_totaltimems{juju_unit=\"$juju_unit\",quantile=\"0.99\",request=\"FetchConsumer\"})",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "{{instance}}",
+          "legendFormat": "{{juju_unit}}",
           "refId": "D"
         }
       ],
@@ -1743,11 +1743,11 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg by(instance) (kafka_network_requestmetrics_totaltimems{instance=~\"$broker\",quantile=\"0.99\",request=\"FetchFollower\"})",
+          "expr": "avg by(juju_unit) (kafka_network_requestmetrics_totaltimems{juju_unit=\"$juju_unit\",quantile=\"0.99\",request=\"FetchFollower\"})",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "{{instance}}",
+          "legendFormat": "{{juju_unit}}",
           "refId": "D"
         }
       ],
@@ -1862,7 +1862,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(kafka_server_brokertopicmetrics_messagesinpersec{instance=~\"$broker\", juju_application=\"$juju_application\", juju_model=\"$juju_model\", juju_model_uuid=\"$juju_model_uuid\", juju_unit=\"$juju_unit\", topic!=\"\", topic=~\"$topic\"}[5m])",
+          "expr": "rate(kafka_server_brokertopicmetrics_messagesinpersec{juju_application=\"$juju_application\", juju_model=\"$juju_model\", juju_model_uuid=\"$juju_model_uuid\", juju_unit=\"$juju_unit\", topic!=\"\", topic=~\"$topic\"}[5m])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -1970,7 +1970,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(kafka_server_brokertopicmetrics_bytesinpersec{instance=~\"$broker\",topic!=\"\",topic=~\"$topic\"}[5m])",
+          "expr": "rate(kafka_server_brokertopicmetrics_bytesinpersec{juju_unit=\"$juju_unit\",topic!=\"\",topic=~\"$topic\"}[5m])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 2,
@@ -2084,7 +2084,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(kafka_server_brokertopicmetrics_totalproducerequestspersec{instance=~\"$broker\", juju_application=\"$juju_application\", juju_model=\"$juju_model\", juju_model_uuid=\"$juju_model_uuid\", juju_unit=\"$juju_unit\", topic!=\"\"}[5m])",
+          "expr": "rate(kafka_server_brokertopicmetrics_totalproducerequestspersec{juju_application=\"$juju_application\", juju_model=\"$juju_model\", juju_model_uuid=\"$juju_model_uuid\", juju_unit=\"$juju_unit\", topic!=\"\"}[5m])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -2189,12 +2189,12 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(kafka_network_requestmetrics_requestspersec{instance=~\"$broker\", juju_application=\"$juju_application\", juju_model=\"$juju_model\", juju_model_uuid=\"$juju_model_uuid\", juju_unit=\"$juju_unit\", request=~\"Produce\"}[5m])",
+          "expr": "rate(kafka_network_requestmetrics_requestspersec{juju_application=\"$juju_application\", juju_model=\"$juju_model\", juju_model_uuid=\"$juju_model_uuid\", juju_unit=\"$juju_unit\", request=~\"Produce\"}[5m])",
           "format": "time_series",
           "instant": false,
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "Request: {{instance}}",
+          "legendFormat": "Request: {{juju_unit}}",
           "refId": "A"
         }
       ],
@@ -2308,7 +2308,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(kafka_server_brokertopicmetrics_failedproducerequestspersec{instance=~\"$broker\",  juju_application=\"$juju_application\", juju_model=\"$juju_model\", juju_model_uuid=\"$juju_model_uuid\", juju_unit=\"$juju_unit\", topic!=\"\", topic=~\"$topic\"}[5m])",
+          "expr": "rate(kafka_server_brokertopicmetrics_failedproducerequestspersec{juju_application=\"$juju_application\", juju_model=\"$juju_model\", juju_model_uuid=\"$juju_model_uuid\", juju_unit=\"$juju_unit\", topic!=\"\", topic=~\"$topic\"}[5m])",
           "format": "time_series",
           "instant": false,
           "interval": "",
@@ -2413,7 +2413,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum by(topic) (kafka_server_brokertopicmetrics_failedfetchrequestspersec{instance=~\"$broker\",topic!=\"\",topic=~\"$topic\"})",
+          "expr": "sum by(topic) (kafka_server_brokertopicmetrics_failedfetchrequestspersec{juju_unit=\"$juju_unit\",topic!=\"\",topic=~\"$topic\"})",
           "format": "time_series",
           "instant": false,
           "interval": "",
@@ -2518,7 +2518,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(kafka_server_brokertopicmetrics_failedproducerequestspersec{instance=~\"$broker\",juju_application=\"$juju_application\",juju_model=\"$juju_model\",juju_model_uuid=\"$juju_model_uuid\",juju_unit=\"$juju_unit\"}[5m])",
+          "expr": "rate(kafka_server_brokertopicmetrics_failedproducerequestspersec{juju_application=\"$juju_application\",juju_model=\"$juju_model\",juju_model_uuid=\"$juju_model_uuid\",juju_unit=\"$juju_unit\"}[5m])",
           "format": "time_series",
           "instant": false,
           "interval": "",
@@ -2623,11 +2623,11 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum (kafka_server_sessionexpirelistener_zookeeperdisconnectspersec{instance=~\"$broker\"})by(instance)",
+          "expr": "sum (kafka_server_sessionexpirelistener_zookeeperdisconnectspersec{juju_unit=\"$juju_unit\"})by(juju_unit)",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "Broker - {{instance}}",
+          "legendFormat": "Broker - {{juju_unit}}",
           "refId": "A"
         }
       ],
@@ -2727,11 +2727,11 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum (kafka_server_sessionexpirelistener_zookeeperexpirespersec{instance=~\"$broker\"})by(instance)",
+          "expr": "sum (kafka_server_sessionexpirelistener_zookeeperexpirespersec{juju_unit=\"$juju_unit\"})by(juju_unit)",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "Broker - {{instance}}",
+          "legendFormat": "Broker - {{juju_unit}}",
           "refId": "A"
         }
       ],
@@ -2833,11 +2833,11 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(kafka_server_zookeeperclientmetrics_zookeeperrequestlatencyms{instance=~\"$broker\"})by(instance)",
+          "expr": "sum(kafka_server_zookeeperclientmetrics_zookeeperrequestlatencyms{juju_unit=\"$juju_unit\"})by(juju_unit)",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "Broker: {{instance}}",
+          "legendFormat": "Broker: {{juju_unit}}",
           "refId": "A"
         }
       ],
@@ -2944,7 +2944,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum (kafka_server_replicamanager_isrshrinkspersec{instance=~\"$broker\"})",
+          "expr": "sum (kafka_server_replicamanager_isrshrinkspersec{juju_unit=\"$juju_unit\"})",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -2952,7 +2952,7 @@
           "refId": "A"
         },
         {
-          "expr": "sum (kafka_server_replicamanager_isrexpandspersec{instance=~\"$broker\"})",
+          "expr": "sum (kafka_server_replicamanager_isrexpandspersec{juju_unit=\"$juju_unit\"})",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -3056,7 +3056,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(kafka_network_requestmetrics_requestspersec{instance=~\"$broker\", juju_application=\"$juju_application\", juju_model=\"$juju_model\", juju_model_uuid=\"$juju_model_uuid\", juju_unit=\"$juju_unit\", request=~\"FetchFollower\"}[5m])",
+          "expr": "rate(kafka_network_requestmetrics_requestspersec{juju_application=\"$juju_application\", juju_model=\"$juju_model\", juju_model_uuid=\"$juju_model_uuid\", juju_unit=\"$juju_unit\", request=~\"FetchFollower\"}[5m])",
           "format": "time_series",
           "instant": false,
           "interval": "",
@@ -3162,7 +3162,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(kafka_network_requestmetrics_requestspersec{instance=~\"$broker\", juju_application=\"$juju_application\", juju_model=\"$juju_model\", juju_model_uuid=\"$juju_model_uuid\", juju_unit=\"$juju_unit\", request=\"FetchConsumer\"}[5m])",
+          "expr": "rate(kafka_network_requestmetrics_requestspersec{juju_application=\"$juju_application\", juju_model=\"$juju_model\", juju_model_uuid=\"$juju_model_uuid\", juju_unit=\"$juju_unit\", request=\"FetchConsumer\"}[5m])",
           "format": "time_series",
           "instant": false,
           "interval": "",
@@ -3272,11 +3272,11 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum (kafka_server_delayedoperationpurgatory_purgatorysize{delayedOperation=\"Fetch\",instance=~\"$broker\"})by(instance)",
+          "expr": "sum (kafka_server_delayedoperationpurgatory_purgatorysize{delayedOperation=\"Fetch\",juju_unit=\"$juju_unit\"})by(juju_unit)",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "Broker {{instance}}",
+          "legendFormat": "Broker {{juju_unit}}",
           "refId": "A"
         }
       ],
@@ -3376,11 +3376,11 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(kafka_server_brokertopicmetrics_totalfetchrequestspersec{instance=~\"$broker\", juju_application=\"$juju_application\", juju_model=\"$juju_model\", juju_model_uuid=\"$juju_model_uuid\", juju_unit=\"$juju_unit\", topic!=\"\"}[5m])",
+          "expr": "rate(kafka_server_brokertopicmetrics_totalfetchrequestspersec{juju_application=\"$juju_application\", juju_model=\"$juju_model\", juju_model_uuid=\"$juju_model_uuid\", juju_unit=\"$juju_unit\", topic!=\"\"}[5m])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "Broker: $broker",
+          "legendFormat": "Broker: $juju_unit",
           "refId": "A"
         }
       ],
@@ -3482,11 +3482,11 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum (kafka_server_delayedoperationpurgatory_purgatorysize{delayedOperation=\"Produce\",instance=~\"$broker\"})by(instance)",
+          "expr": "sum (kafka_server_delayedoperationpurgatory_purgatorysize{delayedOperation=\"Produce\",juju_unit=\"$juju_unit\"})by(juju_unit)",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "Broker {{instance}}",
+          "legendFormat": "Broker {{juju_unit}}",
           "refId": "A"
         }
       ],
@@ -3589,11 +3589,11 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum (kafka_controller_controllerstats_leaderelectionrateandtimems{instance=~\"$broker\"})by(instance)",
+          "expr": "sum (kafka_controller_controllerstats_leaderelectionrateandtimems{juju_unit=\"$juju_unit\"})by(juju_unit)",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "Broker - {{instance}}",
+          "legendFormat": "Broker - {{juju_unit}}",
           "refId": "A"
         }
       ],
@@ -3838,12 +3838,12 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sort(sum(kafka_log_log_size{instance=~\"$broker\"})by(instance))",
+          "expr": "sort(sum(kafka_log_log_size{juju_unit=\"$juju_unit\"})by(juju_unit))",
           "format": "time_series",
           "instant": true,
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "Instance Broker:  {{instance}}",
+          "legendFormat": "Instance Broker:  {{juju_unit}}",
           "refId": "A"
         }
       ],
@@ -3944,12 +3944,12 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sort(sum(kafka_server_replicamanager_partitioncount{}) by (instance))",
+          "expr": "sort(sum(kafka_server_replicamanager_partitioncount{}) by (juju_unit))",
           "format": "time_series",
           "instant": true,
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "Instance Broker: {{instance}}",
+          "legendFormat": "Instance Broker: {{juju_unit}}",
           "refId": "A"
         }
       ],
@@ -4063,11 +4063,11 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "jvm_threads_current{instance=~\"$broker\"}",
+              "expr": "jvm_threads_current{juju_unit=\"$juju_unit\"}",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{instance}}",
+              "legendFormat": "{{juju_unit}}",
               "refId": "A"
             }
           ],
@@ -4165,11 +4165,11 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "sum without(area)(jvm_memory_bytes_used{instance=~\"$broker\"} )",
+              "expr": "sum without(area)(jvm_memory_bytes_used{juju_unit=\"$juju_unit\"} )",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "Broker - {{instance}}",
+              "legendFormat": "Broker - {{juju_unit}}",
               "refId": "A"
             }
           ],
@@ -4267,11 +4267,11 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "rate(process_cpu_seconds_total{instance=~\"$broker\"}[5m])",
+              "expr": "rate(process_cpu_seconds_total{juju_unit=\"$juju_unit\"}[5m])",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "Broker - {{instance}}",
+              "legendFormat": "Broker - {{juju_unit}}",
               "refId": "A"
             }
           ],
@@ -4369,11 +4369,11 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "sum without(gc)(rate(jvm_gc_collection_seconds_sum{instance=~\"$broker\"}[1m]))",
+              "expr": "sum without(gc)(rate(jvm_gc_collection_seconds_sum{juju_unit=\"$juju_unit\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
-              "legendFormat": "{{instance}}",
+              "legendFormat": "{{juju_unit}}",
               "refId": "A"
             }
           ],
@@ -4432,29 +4432,6 @@
   ],
   "templating": {
     "list": [
-      {
-        "allValue": null,
-        "current": {},
-        "datasource": "${prometheusds}",
-        "definition": "label_values(kafka_controller_kafkacontroller_controllerstate{instance)",
-        "error": null,
-        "hide": 0,
-        "includeAll": true,
-        "label": "Broker",
-        "multi": true,
-        "name": "broker",
-        "options": [],
-        "query": "label_values(kafka_controller_kafkacontroller_controllerstate{}, instance)",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      },
       {
         "allValue": null,
         "current": {},