diff --git a/rules/rules-overridden-azure/technology-usage/connect.windup.xml b/rules/rules-overridden-azure/technology-usage/connect.windup.xml
index 17a0cb43..7f7ffdba 100644
--- a/rules/rules-overridden-azure/technology-usage/connect.windup.xml
+++ b/rules/rules-overridden-azure/technology-usage/connect.windup.xml
@@ -49,5 +49,29 @@
                 <technology-tag level="INFORMATIONAL">ActiveMQ</technology-tag>
             </perform>
         </rule>
+        <rule id="connect-02900">
+            <when>
+                <or>
+                    <file filename="{*}kafka-clients{*}"/>
+                    <file filename="{*}spring-kafka{*}"/>
+                </or>
+            </when>
+            <perform>
+                <hint title="Kafka Client found" category-id="potential" effort="3">
+                    <message>
+                        To migrate a Java application that uses Kafka to Azure, you can follow these recommendations:
+
+                        * Provision **Azure Event Hubs**: Azure Event Hubs is a fully managed service in the cloud. Event Hubs offers you the freedom of not having to manage servers or networks or worry about configuring brokers.
+
+                        * Update the application's **Kafka connection** details: Configure your existing Kafka applications to talk to Azure Event Hubs, an alternative to running your own Kafka clusters.
+
+                        * **Configure Azure Event Hubs**: You can configure the most demanding features of Event Hubs like Capture, Auto-Inflate, and Geo Disaster-Recovery.
+                    </message>
+                    <link title="What is Azure Event Hubs for Apache Kafka" href="https://learn.microsoft.com/azure/event-hubs/azure-event-hubs-kafka-overview"/>
+                    <link title="Azure HDInsight documentation" href="https://learn.microsoft.com/azure/hdinsight/"/>
+                </hint>
+                <technology-tag level="INFORMATIONAL">Kafka Client</technology-tag>
+            </perform>
+        </rule>
     </rules>
 </ruleset>
diff --git a/rules/rules-overridden-azure/technology-usage/tests/connect-target-azure-appservice.windup.test.xml b/rules/rules-overridden-azure/technology-usage/tests/connect-target-azure-appservice.windup.test.xml
index 4c217c6e..75e7f0d9 100644
--- a/rules/rules-overridden-azure/technology-usage/tests/connect-target-azure-appservice.windup.test.xml
+++ b/rules/rules-overridden-azure/technology-usage/tests/connect-target-azure-appservice.windup.test.xml
@@ -21,6 +21,18 @@
                     <fail message="ActiveMQ connect found hint was not found!"/>
                 </perform>
             </rule>
+            <rule id="connect-azure-appservice-test-02900">
+                <when>
+                    <not>
+                        <iterable-filter size="2">
+                            <hint-exists message="To migrate a Java application that uses Kafka to Azure, you can follow these recommendations"/>
+                        </iterable-filter>
+                    </not>
+                </when>
+                <perform>
+                    <fail message="Kafka connect found hint was not found!"/>
+                </perform>
+            </rule>
         </rules>
     </ruleset>
 </ruletest>
diff --git a/rules/rules-overridden-azure/technology-usage/tests/connect-target-discovery.windup.test.xml b/rules/rules-overridden-azure/technology-usage/tests/connect-target-discovery.windup.test.xml
index db579bea..caba7908 100644
--- a/rules/rules-overridden-azure/technology-usage/tests/connect-target-discovery.windup.test.xml
+++ b/rules/rules-overridden-azure/technology-usage/tests/connect-target-discovery.windup.test.xml
@@ -20,6 +20,17 @@
                     <fail message="Expected data not found for rule connect-01500"/>
                 </perform>
             </rule>
+            <rule id="connect-discovery-02900-test">
+                <when>
+                    <not>
+                        <classification-exists classification="Embedded library - Kafka Client"/>
+                        <technology-tag-exists technology-tag="Kafka Client"/>
+                    </not>
+                </when>
+                <perform>
+                    <fail message="Expected data not found for rule connect-02900"/>
+                </perform>
+            </rule>
         </rules>
     </ruleset>
 </ruletest>