diff --git a/addons/kafka/opsdefinitions/quota.yaml b/addons/kafka/opsdefinitions/quota.yaml
index 994529e65..4b26e8451 100644
--- a/addons/kafka/opsdefinitions/quota.yaml
+++ b/addons/kafka/opsdefinitions/quota.yaml
@@ -4,7 +4,10 @@ metadata:
   name: kafka-quota
 spec:
   componentDefinitionRefs:
-  - serviceKind: kafka
+  - name: kafka-broker
+    accountName: client
+    serviceName: broker
+  - name: kafka-combine-server
     accountName: client
     serviceName: broker
 
diff --git a/addons/kafka/opsdefinitions/topic.yaml b/addons/kafka/opsdefinitions/topic.yaml
index 3a41bc977..eaabd5a13 100644
--- a/addons/kafka/opsdefinitions/topic.yaml
+++ b/addons/kafka/opsdefinitions/topic.yaml
@@ -4,7 +4,10 @@ metadata:
   name: kafka-topic
 spec:
   componentDefinitionRefs:
-  - serviceKind: kafka
+  - name: kafka-broker
+    accountName: client
+    serviceName: broker
+  - name: kafka-combine-server
     accountName: client
     serviceName: broker
 
diff --git a/addons/kafka/opsdefinitions/useracl.yaml b/addons/kafka/opsdefinitions/useracl.yaml
index beab849ef..0fd436ca6 100644
--- a/addons/kafka/opsdefinitions/useracl.yaml
+++ b/addons/kafka/opsdefinitions/useracl.yaml
@@ -4,7 +4,10 @@ metadata:
   name: kafka-user-acl
 spec:
   componentDefinitionRefs:
-  - serviceKind: kafka
+  - name: kafka-broker
+    accountName: client
+    serviceName: broker
+  - name: kafka-combine-server
     accountName: client
     serviceName: broker