diff --git a/charts/cp-kafka-connect/templates/jmx-configmap.yaml b/charts/cp-kafka-connect/templates/jmx-configmap.yaml
index 9c8d6302..9c1c1dcf 100644
--- a/charts/cp-kafka-connect/templates/jmx-configmap.yaml
+++ b/charts/cp-kafka-connect/templates/jmx-configmap.yaml
@@ -14,6 +14,10 @@ data:
     lowercaseOutputName: true
     lowercaseOutputLabelNames: true
     ssl: false
+    whitelistObjectNames:
+    - kafka.connect:type=connect-worker-metrics
+    - kafka.connect:type=connect-metrics, client-id=*
+    - kafka.connect:type=connector-task-metrics, connector=*, task=*
     rules:
     - pattern : "kafka.connect<type=connect-worker-metrics>([^:]+):"
       name: "cp_kafka_connect_connect_worker_metrics_$1"
diff --git a/charts/cp-kafka-rest/templates/jmx-configmap.yaml b/charts/cp-kafka-rest/templates/jmx-configmap.yaml
index a3941578..e70fc5fc 100644
--- a/charts/cp-kafka-rest/templates/jmx-configmap.yaml
+++ b/charts/cp-kafka-rest/templates/jmx-configmap.yaml
@@ -14,6 +14,9 @@ data:
     lowercaseOutputName: true
     lowercaseOutputLabelNames: true
     ssl: false
+    whitelistObjectNames:
+    - kafka.rest:type=jetty-metrics
+    - kafka.rest:type=jersey-metrics
     rules:
     - pattern : 'kafka.rest<type=jetty-metrics>([^:]+):'
       name: "cp_kafka_rest_jetty_metrics_$1"
diff --git a/charts/cp-kafka/templates/jmx-configmap.yaml b/charts/cp-kafka/templates/jmx-configmap.yaml
index fde14cb4..c77806c2 100644
--- a/charts/cp-kafka/templates/jmx-configmap.yaml
+++ b/charts/cp-kafka/templates/jmx-configmap.yaml
@@ -14,6 +14,16 @@ data:
     lowercaseOutputName: true
     lowercaseOutputLabelNames: true
     ssl: false
+    whitelistObjectNames:
+    - kafka.server:type=ReplicaManager, name=*
+    - kafka.controller:type=KafkaController, name=*
+    - kafka.server:type=BrokerTopicMetrics, name=*
+    - kafka.network:type=RequestMetrics, name=RequestsPerSec, request=*
+    - kafka.network:type=SocketServer, name=NetworkProcessorAvgIdlePercent
+    - kafka.server:type=ReplicaFetcherManager, name=MaxLag, clientId=*
+    - kafka.server:type=KafkaRequestHandlerPool, name=RequestHandlerAvgIdlePercent
+    - kafka.controller:type=ControllerStats, name=*
+    - kafka.server:type=SessionExpireListener, name=*
     rules:
     - pattern : kafka.server<type=ReplicaManager, name=(.+)><>(Value|OneMinuteRate)
       name: "cp_kafka_server_replicamanager_$1"
diff --git a/charts/cp-ksql-server/templates/jmx-configmap.yaml b/charts/cp-ksql-server/templates/jmx-configmap.yaml
index 582194fd..7a27fcff 100644
--- a/charts/cp-ksql-server/templates/jmx-configmap.yaml
+++ b/charts/cp-ksql-server/templates/jmx-configmap.yaml
@@ -14,6 +14,8 @@ data:
     lowercaseOutputName: true
     lowercaseOutputLabelNames: true
     ssl: false
+    whitelistObjectNames:
+    - io.confluent.ksql.metrics:type=ksql-engine-query-stats
     rules:
     - pattern : 'io.confluent.ksql.metrics<type=ksql-engine-query-stats>([^:]+):'
       name: "cp_ksql_server_metrics_$1"
diff --git a/charts/cp-schema-registry/templates/jmx-configmap.yaml b/charts/cp-schema-registry/templates/jmx-configmap.yaml
index 9147bc03..2e32505d 100644
--- a/charts/cp-schema-registry/templates/jmx-configmap.yaml
+++ b/charts/cp-schema-registry/templates/jmx-configmap.yaml
@@ -14,6 +14,10 @@ data:
     lowercaseOutputName: true
     lowercaseOutputLabelNames: true
     ssl: false
+    whitelistObjectNames:
+    - kafka.schema.registry:type=jetty-metrics
+    - kafka.schema.registry:type=master-slave-role
+    - kafka.schema.registry:type=jersey-metrics
     rules:
     - pattern : 'kafka.schema.registry<type=jetty-metrics>([^:]+):'
       name: "cp_kafka_schema_registry_jetty_metrics_$1"
diff --git a/charts/cp-zookeeper/templates/jmx-configmap.yaml b/charts/cp-zookeeper/templates/jmx-configmap.yaml
index 1732bf42..951a8852 100644
--- a/charts/cp-zookeeper/templates/jmx-configmap.yaml
+++ b/charts/cp-zookeeper/templates/jmx-configmap.yaml
@@ -14,6 +14,11 @@ data:
     lowercaseOutputName: true
     lowercaseOutputLabelNames: true
     ssl: false
+    whitelistObjectNames:
+    - org.apache.ZooKeeperService:name0=ReplicatedServer_id*
+    - org.apache.ZooKeeperService:name0=ReplicatedServer_id*, name1=replica.*
+    - org.apache.ZooKeeperService:name0=ReplicatedServer_id*, name1=replica.*, name2=*
+    - org.apache.ZooKeeperService:name0=ReplicatedServer_id*, name1=replica.*, name2=*, name3=*
     rules:
     - pattern: "org.apache.ZooKeeperService<name0=ReplicatedServer_id(\\d+)><>(\\w+)"
       name: "cp_zookeeper_$2"