diff --git a/helm-charts/common/dashboard/templates/configmap-metrics.yaml b/helm-charts/common/dashboard/templates/configmap-metrics.yaml
index 9bf7edaa3..081da18bd 100644
--- a/helm-charts/common/dashboard/templates/configmap-metrics.yaml
+++ b/helm-charts/common/dashboard/templates/configmap-metrics.yaml
@@ -111,7 +111,7 @@ data:
                   }
                 ]
               },
-              "unit": "cps"
+              "unit": "reqps"
             },
             "overrides": []
           },
@@ -640,7 +640,7 @@ data:
                   }
                 ]
               },
-              "unit": "cps"
+              "unit": "t/s"
             },
             "overrides": []
           },
@@ -1091,7 +1091,7 @@ data:
                   }
                 ]
               },
-              "unit": "cps"
+              "unit": "t/s"
             },
             "overrides": []
           },
@@ -1970,7 +1970,7 @@ data:
           "type": "timeseries"
         }
       ],
-      "refresh": false,
+      "refresh": "30s",
       "schemaVersion": 38,
       "tags": [],
       "templating": {
@@ -2005,7 +2005,7 @@ data:
               "type": "prometheus",
               "uid": "${Metrics}"
             },
-            "definition": "label_values(megaservice_first_token_latency_count,namespace)",
+            "definition": "label_values(megaservice_request_pending,namespace)",
             "hide": 0,
             "includeAll": false,
             "label": "Namespace",
@@ -2014,7 +2014,7 @@ data:
             "options": [],
             "query": {
               "qryType": 1,
-              "query": "label_values(megaservice_first_token_latency_count,namespace)",
+              "query": "label_values(megaservice_request_pending,namespace)",
               "refId": "PrometheusVariableQueryEditor-VariableQuery"
             },
             "refresh": 2,
@@ -2033,7 +2033,7 @@ data:
               "type": "prometheus",
               "uid": "${Metrics}"
             },
-            "definition": "label_values(megaservice_first_token_latency_count{namespace=\"$namespace\", service!~\".*-uservice\", service!~\".*-usvc\"},service)",
+            "definition": "label_values(megaservice_request_pending{namespace=\"$namespace\", service!~\".*-uservice\", service!~\".*-usvc\"},service)",
             "description": "Helm release name used as prefix for the services",
             "hide": 0,
             "includeAll": false,
@@ -2043,7 +2043,7 @@ data:
             "options": [],
             "query": {
               "qryType": 1,
-              "query": "label_values(megaservice_first_token_latency_count{namespace=\"$namespace\", service!~\".*-uservice\", service!~\".*-usvc\"},service)",
+              "query": "label_values(megaservice_request_pending{namespace=\"$namespace\", service!~\".*-uservice\", service!~\".*-usvc\"},service)",
               "refId": "PrometheusVariableQueryEditor-VariableQuery"
             },
             "refresh": 2,