diff --git a/core/src/main/resources/jmx/rules/broker.yaml b/core/src/main/resources/jmx/rules/broker.yaml
index b0ce111935..390b9b490e 100644
--- a/core/src/main/resources/jmx/rules/broker.yaml
+++ b/core/src/main/resources/jmx/rules/broker.yaml
@@ -40,7 +40,7 @@ rules:
       type: const(fetch)
     mapping:
       Count:
-        metric: kafka.request.count
+        metric: kafka.topic.request.count
         type: counter
         desc: The number of requests received by the broker
         unit: "{requests}"
@@ -51,7 +51,7 @@ rules:
       type: const(produce)
     mapping:
       Count:
-        metric: kafka.request.count
+        metric: kafka.topic.request.count
         type: counter
         desc: The number of requests received by the broker
         unit: "{requests}"
@@ -62,7 +62,7 @@ rules:
       type: const(fetch)
     mapping:
       Count:
-        metric: kafka.request.failed
+        metric: kafka.topic.request.failed
         type: counter
         desc: The number of requests to the broker resulting in a failure
         unit: "{requests}"
@@ -73,24 +73,22 @@ rules:
       type: const(produce)
     mapping:
       Count:
-        metric: kafka.request.failed
+        metric: kafka.topic.request.failed
         type: counter
         desc: The number of requests to the broker resulting in a failure
         unit: "{requests}"
 
   # Request Metrics
   - beans:
-      - kafka.network:type=RequestMetrics,name=RequestsPerSec,request=Produce
-      - kafka.network:type=RequestMetrics,name=RequestsPerSec,request=Fetch
-      - kafka.network:type=RequestMetrics,name=RequestsPerSec,request=AlterPartitionReassignments
+      - kafka.network:type=RequestMetrics,name=RequestsPerSec,request=*,version=*
     metricAttribute:
       type: param(request)
-    unit: ms
     mapping:
       Count:
         metric: kafka.request.count
         type: counter
         desc: The total number of requests received by the broker
+        unit: "{requests}"
 
   - beans:
       - kafka.network:type=RequestMetrics,name=TotalTimeMs,request=Produce