diff --git a/rules-reviewed/azure/azure-file-system.windup.xml b/rules-reviewed/azure/azure-file-system.windup.xml
index 43694e084..ef68b9a61 100644
--- a/rules-reviewed/azure/azure-file-system.windup.xml
+++ b/rules-reviewed/azure/azure-file-system.windup.xml
@@ -15,7 +15,7 @@
         <sourceTechnology id="springboot"/>
         <targetTechnology id="azure-appservice"/>
         <targetTechnology id="azure-aks"/>
-        <tag>file system</tag>
+        <tag>file-system</tag>
     </metadata>
     <rules>
         <rule id="azure-file-system-01000">
diff --git a/rules-reviewed/azure/eap/eap-to-azure-appservice-environment-variables.windup.xml b/rules-reviewed/azure/eap/eap-to-azure-appservice-environment-variables.windup.xml
index ae8faab23..af289f4fb 100644
--- a/rules-reviewed/azure/eap/eap-to-azure-appservice-environment-variables.windup.xml
+++ b/rules-reviewed/azure/eap/eap-to-azure-appservice-environment-variables.windup.xml
@@ -13,7 +13,7 @@
         </dependencies>
         <sourceTechnology id="eap" versionRange="[7,8)" />
         <targetTechnology id="azure-appservice"/>
-        <tag>JBoss EAP</tag>
+        <tag>JBossEAP</tag>
         <tag>Azure</tag>
     </metadata>
     <rules>
diff --git a/rules-reviewed/azure/springboot/spring-boot-to-azure-cache.windup.xml b/rules-reviewed/azure/springboot/spring-boot-to-azure-cache.windup.xml
index 27d80b9d5..6fc2a4043 100644
--- a/rules-reviewed/azure/springboot/spring-boot-to-azure-cache.windup.xml
+++ b/rules-reviewed/azure/springboot/spring-boot-to-azure-cache.windup.xml
@@ -14,6 +14,7 @@
         <targetTechnology id="azure-appservice"/>
         <targetTechnology id="azure-aks"/>
         <tag>cache</tag>
+        <tag>redis</tag>
     </metadata>
     <rules>
         <rule id="spring-boot-to-azure-cache-redis-01000">
diff --git a/rules-reviewed/azure/springboot/spring-boot-to-azure-jms-broker.windup.xml b/rules-reviewed/azure/springboot/spring-boot-to-azure-jms-broker.windup.xml
index 8a8b5ca9b..c84855989 100644
--- a/rules-reviewed/azure/springboot/spring-boot-to-azure-jms-broker.windup.xml
+++ b/rules-reviewed/azure/springboot/spring-boot-to-azure-jms-broker.windup.xml
@@ -14,6 +14,7 @@
         <targetTechnology id="azure-appservice"/>
         <targetTechnology id="azure-aks"/>
         <tag>broker</tag>
+        <tag>activemq</tag>
     </metadata>
     <rules>
         <rule id="spring-boot-to-azure-jms-broker-01000">
diff --git a/rules-reviewed/azure/springboot/spring-boot-to-azure-schedule-job.windup.xml b/rules-reviewed/azure/springboot/spring-boot-to-azure-schedule-job.windup.xml
index db0fb67df..a31333242 100644
--- a/rules-reviewed/azure/springboot/spring-boot-to-azure-schedule-job.windup.xml
+++ b/rules-reviewed/azure/springboot/spring-boot-to-azure-schedule-job.windup.xml
@@ -14,6 +14,7 @@
         <targetTechnology id="azure-appservice"/>
         <targetTechnology id="azure-aks"/>
         <tag>scheduler</tag>
+        <tag>quartz</tag>
     </metadata>
     <rules>
         <rule id="spring-boot-to-azure-schedule-job-01000">
diff --git a/rules-reviewed/azure/springboot/spring-boot-to-azure-static-content.windup.xml b/rules-reviewed/azure/springboot/spring-boot-to-azure-static-content.windup.xml
index c1f37ebe9..3839011a1 100644
--- a/rules-reviewed/azure/springboot/spring-boot-to-azure-static-content.windup.xml
+++ b/rules-reviewed/azure/springboot/spring-boot-to-azure-static-content.windup.xml
@@ -13,7 +13,7 @@
         <sourceTechnology id="springboot"/>
         <targetTechnology id="azure-appservice"/>
         <targetTechnology id="azure-aks"/>
-        <tag>static content</tag>
+        <tag>static-content</tag>
     </metadata>
     <rules>
         <rule id="spring-boot-to-azure-static-content-01000">
diff --git a/rules-reviewed/eap6/commonj/commonj.windup.xml b/rules-reviewed/eap6/commonj/commonj.windup.xml
index 841d6ad4c..933fec52b 100644
--- a/rules-reviewed/eap6/commonj/commonj.windup.xml
+++ b/rules-reviewed/eap6/commonj/commonj.windup.xml
@@ -14,6 +14,7 @@
         <sourceTechnology id="websphere"/>
         <targetTechnology id="eap" versionRange="[6,)"/>
         <targetTechnology id="java-ee" versionRange="[6,)"/>
+        <tag>commonj</tag>
     </metadata>
     <rules>
         <rule id="commonj-01000">
diff --git a/rules-reviewed/eap6/glassfish/xml-glassfish.windup.xml b/rules-reviewed/eap6/glassfish/xml-glassfish.windup.xml
index 0eafb9ee7..357f361e2 100644
--- a/rules-reviewed/eap6/glassfish/xml-glassfish.windup.xml
+++ b/rules-reviewed/eap6/glassfish/xml-glassfish.windup.xml
@@ -15,6 +15,7 @@
         <targetTechnology id="eap" versionRange="[6,)" />
         <tag>web-app</tag>
         <tag>glassfish</tag>
+        <tag>configuration</tag>
     </metadata>
     <rules>
         <rule id="xml-glassfish-01000">
diff --git a/rules-reviewed/eap6/java-ee/java-ee-jaxrpc.windup.xml b/rules-reviewed/eap6/java-ee/java-ee-jaxrpc.windup.xml
index 7da17fc13..3973b660c 100644
--- a/rules-reviewed/eap6/java-ee/java-ee-jaxrpc.windup.xml
+++ b/rules-reviewed/eap6/java-ee/java-ee-jaxrpc.windup.xml
@@ -12,6 +12,8 @@
         </dependencies>
         <sourceTechnology id="java-ee" />
         <targetTechnology id="eap" versionRange="[6,)" />
+        <tag>jax-rpc</tag>
+        <tag>soap</tag>
     </metadata>
 
     <rules>
diff --git a/rules-reviewed/eap6/java-ee/seam/seam-java.windup.xml b/rules-reviewed/eap6/java-ee/seam/seam-java.windup.xml
index d93f35ba4..740c0a049 100644
--- a/rules-reviewed/eap6/java-ee/seam/seam-java.windup.xml
+++ b/rules-reviewed/eap6/java-ee/seam/seam-java.windup.xml
@@ -15,6 +15,7 @@
         <sourceTechnology id="eap" versionRange="[4,6)"/>
         <sourceTechnology id="seam" versionRange="[2.0,2.1,2.2,2.3]"/>
         <targetTechnology id="eap" versionRange="[6,8)"/>
+        <tag>seam</tag>
     </metadata>
     <rules>
         <rule id="seam-java-00000">
diff --git a/rules-reviewed/eap6/java-ee/seam/seam-ui.windup.xml b/rules-reviewed/eap6/java-ee/seam/seam-ui.windup.xml
index ae7aa4bc6..c7da5daa1 100644
--- a/rules-reviewed/eap6/java-ee/seam/seam-ui.windup.xml
+++ b/rules-reviewed/eap6/java-ee/seam/seam-ui.windup.xml
@@ -14,6 +14,8 @@
         <sourceTechnology id="eap" versionRange="[5,6)"/>
         <sourceTechnology id="seam" versionRange="[2.0,2.1,2.2,2.3]"/>
         <targetTechnology id="eap" versionRange="[6,8)" />
+        <tag>seam</tag>
+        <tag>jsf</tag>
     </metadata>
 
     <rules>
diff --git a/rules-reviewed/eap6/java-ee/xml-webservices.windup.xml b/rules-reviewed/eap6/java-ee/xml-webservices.windup.xml
index 5dad6a5a0..719ff916c 100644
--- a/rules-reviewed/eap6/java-ee/xml-webservices.windup.xml
+++ b/rules-reviewed/eap6/java-ee/xml-webservices.windup.xml
@@ -12,6 +12,7 @@
         </dependencies>
         <sourceTechnology id="java-ee" />
         <targetTechnology id="eap" versionRange="[6,)" />
+        <tag>webservice</tag>
     </metadata>
 
     <rules>
diff --git a/rules-reviewed/eap6/jboss-eap5/resteasy.windup.xml b/rules-reviewed/eap6/jboss-eap5/resteasy.windup.xml
index b4ed0cd9b..6a2cae0c4 100644
--- a/rules-reviewed/eap6/jboss-eap5/resteasy.windup.xml
+++ b/rules-reviewed/eap6/jboss-eap5/resteasy.windup.xml
@@ -10,6 +10,7 @@
         </dependencies>
         <sourceTechnology id="eap" versionRange="[5,6)" />
         <targetTechnology id="eap" versionRange="[6,7)" />
+        <tag>resteasy</tag>
     </metadata>
     <rules>
         <rule id="resteasy-eap5-000001">
diff --git a/rules-reviewed/eap6/jonas/xml-jonas.windup.xml b/rules-reviewed/eap6/jonas/xml-jonas.windup.xml
index a46767a06..e7419d1dc 100644
--- a/rules-reviewed/eap6/jonas/xml-jonas.windup.xml
+++ b/rules-reviewed/eap6/jonas/xml-jonas.windup.xml
@@ -14,6 +14,7 @@
         <targetTechnology id="eap" versionRange="[6,)" />
         <tag>jonas</tag>
         <tag>web-app</tag>
+        <tag>configuration</tag>
     </metadata>
     <rules>
         <rule id="xml-jonas-01000">
diff --git a/rules-reviewed/eap6/jotm/jotm.rhamt.xml b/rules-reviewed/eap6/jotm/jotm.rhamt.xml
index af1404e4e..5018dddea 100644
--- a/rules-reviewed/eap6/jotm/jotm.rhamt.xml
+++ b/rules-reviewed/eap6/jotm/jotm.rhamt.xml
@@ -10,6 +10,8 @@
             <addon id="org.jboss.windup.rules,windup-rules-java,3.0.0.Final" />
         </dependencies>
         <targetTechnology id="eap" versionRange="[6,)" />
+        <tag>transactions</tag>
+        <tag>jta</tag>
     </metadata>
     <rules>
         <rule id="jotm-00001">
diff --git a/rules-reviewed/eap6/jrun/xml-jrun.windup.xml b/rules-reviewed/eap6/jrun/xml-jrun.windup.xml
index 86f86c19e..5309d212e 100644
--- a/rules-reviewed/eap6/jrun/xml-jrun.windup.xml
+++ b/rules-reviewed/eap6/jrun/xml-jrun.windup.xml
@@ -14,6 +14,7 @@
         <targetTechnology id="eap" versionRange="[6,)" />
         <tag>web-app</tag>
         <tag>jrun</tag>
+        <tag>configuration</tag>
     </metadata>
     <rules>
         <rule id="xml-jrun-01000">
diff --git a/rules-reviewed/eap6/orion/xml-orion.windup.xml b/rules-reviewed/eap6/orion/xml-orion.windup.xml
index 55817a685..53cf15ce4 100644
--- a/rules-reviewed/eap6/orion/xml-orion.windup.xml
+++ b/rules-reviewed/eap6/orion/xml-orion.windup.xml
@@ -15,6 +15,7 @@
         <targetTechnology id="eap" versionRange="[6,)" />
         <tag>web-app</tag>
         <tag>orion</tag>
+         <tag>configuration</tag>
     </metadata>
 
     <rules>
diff --git a/rules-reviewed/eap6/resin/xml-resin.windup.xml b/rules-reviewed/eap6/resin/xml-resin.windup.xml
index e94979dba..849b22a92 100644
--- a/rules-reviewed/eap6/resin/xml-resin.windup.xml
+++ b/rules-reviewed/eap6/resin/xml-resin.windup.xml
@@ -15,6 +15,7 @@
         <targetTechnology id="eap" versionRange="[6,)"/>
         <tag>web-app</tag>
         <tag>resin</tag>
+        <tag>configuration</tag>
     </metadata>
     <rules>
         <rule id="xml-resin-01000">
diff --git a/rules-reviewed/eap6/weblogic/weblogic-ejb.windup.xml b/rules-reviewed/eap6/weblogic/weblogic-ejb.windup.xml
index fdea2c18e..ea3fa9b71 100644
--- a/rules-reviewed/eap6/weblogic/weblogic-ejb.windup.xml
+++ b/rules-reviewed/eap6/weblogic/weblogic-ejb.windup.xml
@@ -14,6 +14,8 @@
         </dependencies>
         <sourceTechnology id="weblogic" />
         <targetTechnology id="eap" versionRange="[6,)" />
+        <tag>ejb</tag>
+        <tag>weblogic</tag>
     </metadata>
     <rules>
         <rule id="weblogic-ejb-01000">
diff --git a/rules-reviewed/eap6/weblogic/weblogic-jms.windup.xml b/rules-reviewed/eap6/weblogic/weblogic-jms.windup.xml
index 530904972..2033a4748 100644
--- a/rules-reviewed/eap6/weblogic/weblogic-jms.windup.xml
+++ b/rules-reviewed/eap6/weblogic/weblogic-jms.windup.xml
@@ -14,6 +14,8 @@
         </dependencies>
         <sourceTechnology id="weblogic" />
         <targetTechnology id="eap" versionRange="[6,7)" />
+        <tag>jms</tag>
+        <tag>weblogic</tag>
     </metadata>
     <rules>
         <rule id="weblogic-jms-00000">
diff --git a/rules-reviewed/eap6/weblogic/weblogic-services.windup.xml b/rules-reviewed/eap6/weblogic/weblogic-services.windup.xml
index 12862f135..d86bf38c5 100644
--- a/rules-reviewed/eap6/weblogic/weblogic-services.windup.xml
+++ b/rules-reviewed/eap6/weblogic/weblogic-services.windup.xml
@@ -14,6 +14,7 @@
         </dependencies>
         <sourceTechnology id="weblogic"/>
         <targetTechnology id="eap" versionRange="[6,7)"/>
+        <tag>weblogic</tag>
     </metadata>
 
     <rules>
diff --git a/rules-reviewed/eap6/weblogic/weblogic-webapp.windup.xml b/rules-reviewed/eap6/weblogic/weblogic-webapp.windup.xml
index 4b1122376..e2bd96481 100644
--- a/rules-reviewed/eap6/weblogic/weblogic-webapp.windup.xml
+++ b/rules-reviewed/eap6/weblogic/weblogic-webapp.windup.xml
@@ -16,6 +16,7 @@
         <sourceTechnology id="weblogic" />
         <targetTechnology id="eap" versionRange="[6,7)" />
         <tag>web-app</tag>
+        <tag>weblogic</tag>
     </metadata>
 
     <rules>
diff --git a/rules-reviewed/eap6/weblogic/weblogic-webservices.windup.xml b/rules-reviewed/eap6/weblogic/weblogic-webservices.windup.xml
index 27efba83e..61cd89d81 100644
--- a/rules-reviewed/eap6/weblogic/weblogic-webservices.windup.xml
+++ b/rules-reviewed/eap6/weblogic/weblogic-webservices.windup.xml
@@ -14,6 +14,7 @@
         <sourceTechnology id="weblogic"/>
         <targetTechnology id="eap" versionRange="[6,7)"/>
         <tag>webservice</tag>
+        <tag>weblogic</tag>
     </metadata>
     <rules>
         <rule id="weblogic-webservices-01000">
diff --git a/rules-reviewed/eap6/websphere/websphere-jms.windup.xml b/rules-reviewed/eap6/websphere/websphere-jms.windup.xml
index 5ceb0294b..3811f27e3 100644
--- a/rules-reviewed/eap6/websphere/websphere-jms.windup.xml
+++ b/rules-reviewed/eap6/websphere/websphere-jms.windup.xml
@@ -13,6 +13,8 @@
         <sourceTechnology id="websphere" />
         <targetTechnology id="eap" versionRange="[6,7)" />
         <targetTechnology id="java-ee" versionRange="[6,)" />
+        <tag>jms</tag>
+        <tag>websphere</tag>
     </metadata>
     <rules>
         <rule id="websphere-jms-00000">
diff --git a/rules-reviewed/eap6/websphere/websphere-mq.windup.xml b/rules-reviewed/eap6/websphere/websphere-mq.windup.xml
index b7fc1895c..ddccad3e7 100644
--- a/rules-reviewed/eap6/websphere/websphere-mq.windup.xml
+++ b/rules-reviewed/eap6/websphere/websphere-mq.windup.xml
@@ -14,6 +14,8 @@
         <sourceTechnology id="websphere" />
         <targetTechnology id="eap" versionRange="[6,7)" />
         <targetTechnology id="java-ee" versionRange="[6,)" />
+        <tag>jms</tag>
+        <tag>websphere</tag>
     </metadata>
 
     <rules>
diff --git a/rules-reviewed/eap6/websphere/websphere-mqe.windup.xml b/rules-reviewed/eap6/websphere/websphere-mqe.windup.xml
index 9b7c7f926..6d307fc95 100644
--- a/rules-reviewed/eap6/websphere/websphere-mqe.windup.xml
+++ b/rules-reviewed/eap6/websphere/websphere-mqe.windup.xml
@@ -14,6 +14,8 @@
         <sourceTechnology id="websphere" />
         <targetTechnology id="eap" versionRange="[6,7)" />
         <targetTechnology id="java-ee" versionRange="[6,)" />
+        <tag>jms</tag>
+        <tag>websphere</tag>
     </metadata>
 
     <rules>
diff --git a/rules-reviewed/eap6/websphere/websphere-other.windup.xml b/rules-reviewed/eap6/websphere/websphere-other.windup.xml
index f76d1ac32..ff4474560 100644
--- a/rules-reviewed/eap6/websphere/websphere-other.windup.xml
+++ b/rules-reviewed/eap6/websphere/websphere-other.windup.xml
@@ -13,6 +13,7 @@
         <sourceTechnology id="websphere" />
         <targetTechnology id="eap" versionRange="[6,7)" />
         <targetTechnology id="java-ee" versionRange="[6,)" />
+        <tag>websphere</tag>
     </metadata>
 
 
diff --git a/rules-reviewed/eap6/websphere/websphere-xml.windup.xml b/rules-reviewed/eap6/websphere/websphere-xml.windup.xml
index 05e7a5335..5cf0189e7 100644
--- a/rules-reviewed/eap6/websphere/websphere-xml.windup.xml
+++ b/rules-reviewed/eap6/websphere/websphere-xml.windup.xml
@@ -10,6 +10,7 @@
         </dependencies>
         <sourceTechnology id="websphere"/>
         <targetTechnology id="eap" versionRange="[6,7)"/>
+        <tag>websphere</tag>
     </metadata>
     <rules>
         <rule id="websphere-xml-01000">
diff --git a/rules-reviewed/eap7/eap5/base64.windup.xml b/rules-reviewed/eap7/eap5/base64.windup.xml
index b755ff5cb..17aaf6fc0 100644
--- a/rules-reviewed/eap7/eap5/base64.windup.xml
+++ b/rules-reviewed/eap7/eap5/base64.windup.xml
@@ -13,6 +13,8 @@
         <sourceTechnology id="java-ee" />
         <sourceTechnology id="eap"/>
         <targetTechnology id="eap" versionRange="[6,)" />
+        <tag>eap7</tag>
+        <tag>base64</tag>
     </metadata>
 
     <rules>
diff --git a/rules-reviewed/eap7/eap5/jaxrpc.windup.xml b/rules-reviewed/eap7/eap5/jaxrpc.windup.xml
index adcda6b40..d5203e493 100644
--- a/rules-reviewed/eap7/eap5/jaxrpc.windup.xml
+++ b/rules-reviewed/eap7/eap5/jaxrpc.windup.xml
@@ -12,6 +12,8 @@
         </dependencies>
         <sourceTechnology id="java-ee" />
         <targetTechnology id="eap" versionRange="[7,)" />
+        <tag>jax-rpc</tag>
+        <tag>soap</tag>
     </metadata>
 
     <rules>
diff --git a/rules-reviewed/eap7/eap5and6/resteasy.windup.xml b/rules-reviewed/eap7/eap5and6/resteasy.windup.xml
index a3eb9a822..0df39e550 100644
--- a/rules-reviewed/eap7/eap5and6/resteasy.windup.xml
+++ b/rules-reviewed/eap7/eap5and6/resteasy.windup.xml
@@ -12,6 +12,7 @@
         <sourceTechnology id="resteasy" versionRange="[2,3)" />
         <targetTechnology id="eap" versionRange="[7,)" />
         <targetTechnology id="resteasy" versionRange="[3,)" />
+        <tag>resteasy</tag>
     </metadata>
     <rules>
         <rule id="resteasy-eap5and6to7-000018">
diff --git a/rules-reviewed/eap7/eap6/eap6-xml.windup.xml b/rules-reviewed/eap7/eap6/eap6-xml.windup.xml
index 940089e45..f968bfc07 100644
--- a/rules-reviewed/eap7/eap6/eap6-xml.windup.xml
+++ b/rules-reviewed/eap7/eap6/eap6-xml.windup.xml
@@ -13,6 +13,7 @@
         </dependencies>
         <sourceTechnology id="eap" versionRange="[6,7)" />
         <targetTechnology id="eap" versionRange="[7,)" />
+        <tag>configuration</tag>
     </metadata>
 
     <rules>
diff --git a/rules-reviewed/eap7/eap6/hibernate4-xml.windup.xml b/rules-reviewed/eap7/eap6/hibernate4-xml.windup.xml
index b2b9d4f79..c1852776b 100644
--- a/rules-reviewed/eap7/eap6/hibernate4-xml.windup.xml
+++ b/rules-reviewed/eap7/eap6/hibernate4-xml.windup.xml
@@ -14,6 +14,8 @@
         <sourceTechnology id="eap" versionRange="[6,7)" />
         <targetTechnology id="hibernate" versionRange="[5,)" />
         <targetTechnology id="eap" versionRange="[7,)" />
+        <tag>hibernate</tag>
+        <tag>configuration</tag>
     </metadata>
 
     <rules>
diff --git a/rules-reviewed/eap7/eap6/hibernate4.windup.xml b/rules-reviewed/eap7/eap6/hibernate4.windup.xml
index cd5f80de6..d0d72029a 100644
--- a/rules-reviewed/eap7/eap6/hibernate4.windup.xml
+++ b/rules-reviewed/eap7/eap6/hibernate4.windup.xml
@@ -13,6 +13,8 @@
         <sourceTechnology id="eap" versionRange="[6,7)" />
         <targetTechnology id="hibernate" versionRange="[5,)" />
         <targetTechnology id="eap" versionRange="[7,8)" />
+        <tag>hibernate</tag>
+        <tag>configuration</tag>
     </metadata>
     <rules>
         <rule id="hibernate4-00001">
diff --git a/rules-reviewed/eap7/eap6/hsearch.windup.xml b/rules-reviewed/eap7/eap6/hsearch.windup.xml
index 02f3bd446..164f7ef7c 100644
--- a/rules-reviewed/eap7/eap6/hsearch.windup.xml
+++ b/rules-reviewed/eap7/eap6/hsearch.windup.xml
@@ -13,6 +13,8 @@
         <sourceTechnology id="eap" versionRange="[6,7)" />
         <targetTechnology id="hibernate-search" versionRange="[5,)" />
         <targetTechnology id="eap" versionRange="[7,8)" />
+        <tag>hibernate-search</tag>
+        <tag>hibernate</tag>
     </metadata>
     <rules>
         <rule id="hsearch-00000">
diff --git a/rules-reviewed/eap7/eap6/jax-ws.windup.xml b/rules-reviewed/eap7/eap6/jax-ws.windup.xml
index e5bba2549..48b4a4844 100644
--- a/rules-reviewed/eap7/eap6/jax-ws.windup.xml
+++ b/rules-reviewed/eap7/eap6/jax-ws.windup.xml
@@ -13,6 +13,7 @@
             <addon id="org.jboss.windup.rules,windup-rules-java,3.0.0.Final" />
         </dependencies>
         <targetTechnology id="eap" versionRange="[7,)" />
+        <tag>jax-ws</tag>
     </metadata>
     <rules>
         <rule id="jax-ws-00000">
diff --git a/rules-reviewed/eap7/eap6/resteasy.windup.xml b/rules-reviewed/eap7/eap6/resteasy.windup.xml
index 940095dbf..20da2b7ef 100644
--- a/rules-reviewed/eap7/eap6/resteasy.windup.xml
+++ b/rules-reviewed/eap7/eap6/resteasy.windup.xml
@@ -12,6 +12,7 @@
         <sourceTechnology id="resteasy" versionRange="[2,3)" />
         <targetTechnology id="resteasy" versionRange="[3,)" />
         <targetTechnology id="eap" versionRange="[7,8)" />
+        <tag>resteasy</tag>
     </metadata>
     <!-- All links need to be replaced with GA documentation as currently there are only 7.0-beta doc available -->
     <rules>
diff --git a/rules-reviewed/eap7/eap6/ws-security.windup.xml b/rules-reviewed/eap7/eap6/ws-security.windup.xml
index a2eafa77c..6f6368864 100644
--- a/rules-reviewed/eap7/eap6/ws-security.windup.xml
+++ b/rules-reviewed/eap7/eap6/ws-security.windup.xml
@@ -14,6 +14,8 @@
         </dependencies>
         <sourceTechnology id="eap" versionRange="[6,7)" />
         <targetTechnology id="eap" versionRange="[7,)" />
+        <tag>ws-security</tag>
+        <tag>security</tag>
     </metadata>
 
     <rules>
diff --git a/rules-reviewed/eap7/eap70/hibernate50-51.windup.xml b/rules-reviewed/eap7/eap70/hibernate50-51.windup.xml
index 6030aa209..e42e9fc2f 100644
--- a/rules-reviewed/eap7/eap70/hibernate50-51.windup.xml
+++ b/rules-reviewed/eap7/eap70/hibernate50-51.windup.xml
@@ -15,6 +15,7 @@
         <sourceTechnology id="eap" versionRange="(,7.0]" />
         <targetTechnology id="hibernate" versionRange="[5.1,)" />
         <targetTechnology id="eap" versionRange="[7,8)" />
+        <tag>hibernate</tag>
     </metadata>
     <rules>
         <rule id="hibernate50-51-00000">
diff --git a/rules-reviewed/eap7/eap71/hibernate51-53.windup.groovy b/rules-reviewed/eap7/eap71/hibernate51-53.windup.groovy
index 10c038f5d..dc77d769b 100644
--- a/rules-reviewed/eap7/eap71/hibernate51-53.windup.groovy
+++ b/rules-reviewed/eap7/eap71/hibernate51-53.windup.groovy
@@ -5,6 +5,7 @@ import org.jboss.windup.reporting.category.IssueCategoryRegistry
 import org.jboss.windup.reporting.model.QuickfixType
 import org.jboss.windup.reporting.quickfix.Quickfix
 import org.jboss.windup.rules.apps.java.model.JavaClassModel
+import org.jboss.windup.config.metadata.RuleMetadataType
 import org.ocpsoft.rewrite.context.EvaluationContext;
 import org.ocpsoft.rewrite.param.ParameterStore;
 
@@ -120,6 +121,7 @@ ruleSet("hibernate51-53-groovy")
 .addSourceTechnology(new TechnologyReference("hibernate", "(,5.1]"))
 .addTargetTechnology(new TechnologyReference("hibernate", "[5.3,)"))
 .addTargetTechnology(new TechnologyReference("eap", "[7,8)"))
+.addTag("hibernate")
 .addRule()
     .when(
         JavaClass.references("{*}.$methodParam({*}org.hibernate.engine.spi.SessionImplementor{*})").at(TypeReferenceLocation.METHOD)
diff --git a/rules-reviewed/eap7/eap71/hibernate51-53.windup.xml b/rules-reviewed/eap7/eap71/hibernate51-53.windup.xml
index 6dc1d2132..f4b989b74 100644
--- a/rules-reviewed/eap7/eap71/hibernate51-53.windup.xml
+++ b/rules-reviewed/eap7/eap71/hibernate51-53.windup.xml
@@ -14,6 +14,7 @@
         <sourceTechnology id="hibernate" versionRange="(,5.1]" />
         <targetTechnology id="hibernate" versionRange="[5.3,)" />
         <targetTechnology id="eap" versionRange="[7,8)" />
+        <tag>hibernate</tag>
     </metadata>
     <rules>
         <!--https://issues.jboss.org/browse/WINDUPRULE-376-->
diff --git a/rules-reviewed/eap7/eap71/picketlink25.windup.xml b/rules-reviewed/eap7/eap71/picketlink25.windup.xml
index fb9501907..05140095d 100644
--- a/rules-reviewed/eap7/eap71/picketlink25.windup.xml
+++ b/rules-reviewed/eap7/eap71/picketlink25.windup.xml
@@ -13,6 +13,7 @@
         </dependencies>
         <sourceTechnology id="eap" versionRange="(,7.1]" />
         <targetTechnology id="eap" versionRange="[7,8)" />
+        <tag>picketlink</tag>
     </metadata>
     <rules>
         <rule id="picketlink25-00000">
diff --git a/rules-reviewed/eap7/eap71/resteasy30-36.windup.xml b/rules-reviewed/eap7/eap71/resteasy30-36.windup.xml
index 2f2a4b5ea..eac563580 100644
--- a/rules-reviewed/eap7/eap71/resteasy30-36.windup.xml
+++ b/rules-reviewed/eap7/eap71/resteasy30-36.windup.xml
@@ -13,6 +13,7 @@
         </dependencies>
         <targetTechnology id="eap" versionRange="[7,8)" />
         <targetTechnology id="resteasy" versionRange="[3,)" />
+        <tag>resteasy</tag>
     </metadata>
     <rules>
         <!--https://issues.jboss.org/browse/WINDUPRULE-370 -->
diff --git a/rules-reviewed/eap7/eap72/maven-artemis-jms-client.rhamt.xml b/rules-reviewed/eap7/eap72/maven-artemis-jms-client.rhamt.xml
index 3fb4f0354..492bbf238 100644
--- a/rules-reviewed/eap7/eap72/maven-artemis-jms-client.rhamt.xml
+++ b/rules-reviewed/eap7/eap72/maven-artemis-jms-client.rhamt.xml
@@ -10,7 +10,8 @@
             <addon id="org.jboss.windup.rules,windup-rules-javaee,3.0.0.Final" />
             <addon id="org.jboss.windup.rules,windup-rules-java,3.0.0.Final" />
         </dependencies>
-        <targetTechnology id="eap" versionRange="[7,8)" />        
+        <targetTechnology id="eap" versionRange="[7,8)" />    
+        <tag>jms</tag>
     </metadata>
     <rules>
         <!-- https://issues.jboss.org/browse/WINDUPRULE-404 -->
diff --git a/rules-reviewed/eap7/eap72/maven-javax-to-jakarta.rhamt.xml b/rules-reviewed/eap7/eap72/maven-javax-to-jakarta.rhamt.xml
index 254a6817a..5a4fea22e 100644
--- a/rules-reviewed/eap7/eap72/maven-javax-to-jakarta.rhamt.xml
+++ b/rules-reviewed/eap7/eap72/maven-javax-to-jakarta.rhamt.xml
@@ -12,7 +12,8 @@
             <addon id="org.jboss.windup.rules,windup-rules-java,3.0.0.Final" />
         </dependencies>
         <targetTechnology id="eap" versionRange="[7,8)" />  
-        <targetTechnology id="jakarta-ee" versionRange="[8]" />      
+        <targetTechnology id="jakarta-ee" versionRange="[8]" />
+        <tag>JakartaEE</tag>
     </metadata>
     <rules>
         <!-- Originally developed under https://issues.jboss.org/browse/WINDUPRULE-396 -->
diff --git a/rules-reviewed/eap7/eap72/maven-jboss-rmi-api_1.0_spec.rhamt.xml b/rules-reviewed/eap7/eap72/maven-jboss-rmi-api_1.0_spec.rhamt.xml
index 23aa6af9f..dc6e239d5 100644
--- a/rules-reviewed/eap7/eap72/maven-jboss-rmi-api_1.0_spec.rhamt.xml
+++ b/rules-reviewed/eap7/eap72/maven-jboss-rmi-api_1.0_spec.rhamt.xml
@@ -10,7 +10,8 @@
             <addon id="org.jboss.windup.rules,windup-rules-javaee,3.0.0.Final" />
             <addon id="org.jboss.windup.rules,windup-rules-java,3.0.0.Final" />
         </dependencies>
-        <targetTechnology id="eap" versionRange="[7,8)" />        
+        <targetTechnology id="eap" versionRange="[7,8)" />
+        <tag>rmi</tag>
     </metadata>
     <rules>
         <!-- https://issues.jboss.org/browse/WINDUPRULE-401 -->
diff --git a/rules-reviewed/eap7/eap73/microprofile_removed_from_eap.mta.xml b/rules-reviewed/eap7/eap73/microprofile_removed_from_eap.mta.xml
index b9be49da4..b5cf55794 100644
--- a/rules-reviewed/eap7/eap73/microprofile_removed_from_eap.mta.xml
+++ b/rules-reviewed/eap7/eap73/microprofile_removed_from_eap.mta.xml
@@ -10,7 +10,8 @@
             <addon id="org.jboss.windup.rules,windup-rules-javaee,3.0.0.Final" />
             <addon id="org.jboss.windup.rules,windup-rules-java,3.0.0.Final" />
         </dependencies>
-        <targetTechnology id="eap" versionRange="[7,8)" />  
+        <targetTechnology id="eap" versionRange="[7,8)" />
+        <tag>EclipseMicroProfile</tag>
     </metadata>
     <rules>
         <!-- https://issues.jboss.org/browse/WINDUPRULE-757 -->
diff --git a/rules-reviewed/eap7/weblogic/weblogic-jms.windup.xml b/rules-reviewed/eap7/weblogic/weblogic-jms.windup.xml
index 1a48f1347..a7262fc4d 100644
--- a/rules-reviewed/eap7/weblogic/weblogic-jms.windup.xml
+++ b/rules-reviewed/eap7/weblogic/weblogic-jms.windup.xml
@@ -14,6 +14,8 @@
         </dependencies>
         <sourceTechnology id="weblogic" />
         <targetTechnology id="eap" versionRange="[7,8)" />
+        <tag>jms</tag>
+        <tag>weblogic</tag>
     </metadata>
     <rules>
         <rule id="weblogic-jms-eap7-00000">
diff --git a/rules-reviewed/eap7/weblogic/weblogic-services.windup.xml b/rules-reviewed/eap7/weblogic/weblogic-services.windup.xml
index f7ffe274c..c3603e598 100644
--- a/rules-reviewed/eap7/weblogic/weblogic-services.windup.xml
+++ b/rules-reviewed/eap7/weblogic/weblogic-services.windup.xml
@@ -14,6 +14,7 @@
         </dependencies>
         <sourceTechnology id="weblogic"/>
         <targetTechnology id="eap" versionRange="[7,8)"/>
+        <tag>weblogic</tag>
     </metadata>
 
     <rules>
diff --git a/rules-reviewed/eap7/weblogic/weblogic-webapp.windup.xml b/rules-reviewed/eap7/weblogic/weblogic-webapp.windup.xml
index 72362180f..328fbac8c 100644
--- a/rules-reviewed/eap7/weblogic/weblogic-webapp.windup.xml
+++ b/rules-reviewed/eap7/weblogic/weblogic-webapp.windup.xml
@@ -16,6 +16,7 @@
         <sourceTechnology id="weblogic" />
         <targetTechnology id="eap" versionRange="[7,8)" />
         <tag>web-app</tag>
+        <tag>weblogic</tag>
     </metadata>
 
     <rules>
diff --git a/rules-reviewed/eap7/weblogic/weblogic-webservices.windup.xml b/rules-reviewed/eap7/weblogic/weblogic-webservices.windup.xml
index 60214a258..eb7a0073b 100644
--- a/rules-reviewed/eap7/weblogic/weblogic-webservices.windup.xml
+++ b/rules-reviewed/eap7/weblogic/weblogic-webservices.windup.xml
@@ -14,6 +14,7 @@
         <sourceTechnology id="weblogic"/>
         <targetTechnology id="eap" versionRange="[7,8)"/>
         <tag>webservice</tag>
+        <tag>weblogic</tag>
     </metadata>
     <rules>
         <rule id="weblogic-webservices-eap7-01000">
diff --git a/rules-reviewed/eap7/weblogic/weblogic-xml-descriptors.windup.xml b/rules-reviewed/eap7/weblogic/weblogic-xml-descriptors.windup.xml
index 38775b516..a903de656 100644
--- a/rules-reviewed/eap7/weblogic/weblogic-xml-descriptors.windup.xml
+++ b/rules-reviewed/eap7/weblogic/weblogic-xml-descriptors.windup.xml
@@ -15,6 +15,7 @@
         <targetTechnology id="eap" versionRange="[7,8)" />
         <tag>weblogic</tag>
         <tag>descriptor</tag>
+        <tag>configuration</tag>
     </metadata>
 
     <rules>
diff --git a/rules-reviewed/eap7/websphere/websphere-jms.windup.xml b/rules-reviewed/eap7/websphere/websphere-jms.windup.xml
index 4017a4c94..65a89a7e0 100644
--- a/rules-reviewed/eap7/websphere/websphere-jms.windup.xml
+++ b/rules-reviewed/eap7/websphere/websphere-jms.windup.xml
@@ -13,6 +13,8 @@
         <sourceTechnology id="websphere" />
         <targetTechnology id="eap" versionRange="[7,)" />
         <targetTechnology id="java-ee" versionRange="[7,)" />
+        <tag>jms</tag>
+        <tag>websphere</tag>
     </metadata>
     <rules>
         <rule id="websphere-jms-eap7-00000">
diff --git a/rules-reviewed/eap7/websphere/websphere-mq.windup.xml b/rules-reviewed/eap7/websphere/websphere-mq.windup.xml
index 2745b2850..1fee6950c 100644
--- a/rules-reviewed/eap7/websphere/websphere-mq.windup.xml
+++ b/rules-reviewed/eap7/websphere/websphere-mq.windup.xml
@@ -14,6 +14,9 @@
         <sourceTechnology id="websphere" />
         <targetTechnology id="eap" versionRange="[7,)" />
         <targetTechnology id="java-ee" versionRange="[7,)" />
+        <tag>jms</tag>
+        <tag>messaging</tag>
+        <tag>websphere</tag>
     </metadata>
 
     <rules>
diff --git a/rules-reviewed/eap7/websphere/websphere-mqe.windup.xml b/rules-reviewed/eap7/websphere/websphere-mqe.windup.xml
index 586a38374..6eca1b61a 100644
--- a/rules-reviewed/eap7/websphere/websphere-mqe.windup.xml
+++ b/rules-reviewed/eap7/websphere/websphere-mqe.windup.xml
@@ -14,6 +14,9 @@
         <sourceTechnology id="websphere" />
         <targetTechnology id="eap" versionRange="[7,8)" />
         <targetTechnology id="java-ee" versionRange="[7,)" />
+        <tag>jms</tag>
+        <tag>messaging</tag>
+        <tag>websphere</tag>
     </metadata>
 
     <rules>
diff --git a/rules-reviewed/eap7/websphere/websphere-other.windup.xml b/rules-reviewed/eap7/websphere/websphere-other.windup.xml
index 16a04a621..88fecf391 100644
--- a/rules-reviewed/eap7/websphere/websphere-other.windup.xml
+++ b/rules-reviewed/eap7/websphere/websphere-other.windup.xml
@@ -13,6 +13,7 @@
         <sourceTechnology id="websphere" />
         <targetTechnology id="eap" versionRange="[7,)" />
         <targetTechnology id="java-ee" versionRange="[7,)" />
+        <tag>websphere</tag>
     </metadata>
 
 
diff --git a/rules-reviewed/eap7/websphere/websphere-xml.windup.xml b/rules-reviewed/eap7/websphere/websphere-xml.windup.xml
index 50c61faf7..db997604b 100644
--- a/rules-reviewed/eap7/websphere/websphere-xml.windup.xml
+++ b/rules-reviewed/eap7/websphere/websphere-xml.windup.xml
@@ -10,6 +10,8 @@
         </dependencies>
         <sourceTechnology id="websphere"/>
         <targetTechnology id="eap" versionRange="[7,8)"/>
+        <tag>websphere</tag>
+        <tag>configuration</tag>
     </metadata>
     <rules>
         <rule id="eap7-websphere-xml-01000">
diff --git a/rules-reviewed/eapxp/eapxp2/eapxp_bootable_jar_maven_plugin_configuration_changes.mta.xml b/rules-reviewed/eapxp/eapxp2/eapxp_bootable_jar_maven_plugin_configuration_changes.mta.xml
index 416b65f09..7b60184f8 100644
--- a/rules-reviewed/eapxp/eapxp2/eapxp_bootable_jar_maven_plugin_configuration_changes.mta.xml
+++ b/rules-reviewed/eapxp/eapxp2/eapxp_bootable_jar_maven_plugin_configuration_changes.mta.xml
@@ -14,6 +14,8 @@
         </dependencies>
         <sourceTechnology id="eapxp" />
         <targetTechnology id="eapxp" versionRange="[3,)" />
+        <tag>JBossEAP</tag>
+        <tag>EAPXP</tag>
     </metadata>
     <rules>
         <!-- https://issues.jboss.org/browse/WINDUPRULE-759 -->
diff --git a/rules-reviewed/eapxp/thorntail/remove_thorntail_yaml_configuration_files.mta.xml b/rules-reviewed/eapxp/thorntail/remove_thorntail_yaml_configuration_files.mta.xml
index 4f9b4e1f0..1a982d1fb 100644
--- a/rules-reviewed/eapxp/thorntail/remove_thorntail_yaml_configuration_files.mta.xml
+++ b/rules-reviewed/eapxp/thorntail/remove_thorntail_yaml_configuration_files.mta.xml
@@ -14,6 +14,8 @@
         </dependencies>
         <sourceTechnology id="thorntail" />
         <targetTechnology id="eapxp" versionRange="[2,)" />
+        <tag>JBossEAP</tag>
+        <tag>Thorntail</tag>
     </metadata>
     <rules>
         <!-- https://issues.jboss.org/browse/WINDUPRULE-740 -->
diff --git a/rules-reviewed/eapxp/thorntail/replace_thorntail_boms.mta.xml b/rules-reviewed/eapxp/thorntail/replace_thorntail_boms.mta.xml
index 05dafc3cd..a4e707e6e 100644
--- a/rules-reviewed/eapxp/thorntail/replace_thorntail_boms.mta.xml
+++ b/rules-reviewed/eapxp/thorntail/replace_thorntail_boms.mta.xml
@@ -14,6 +14,8 @@
         </dependencies>
         <sourceTechnology id="thorntail" />
         <targetTechnology id="eapxp" versionRange="[2,)" />
+        <tag>JBossEAP</tag>
+        <tag>Thorntail</tag>
     </metadata>
     <rules>
         <!-- https://issues.jboss.org/browse/WINDUPRULE-738 -->
diff --git a/rules-reviewed/eapxp/thorntail/replace_thorntail_fractions.mta.xml b/rules-reviewed/eapxp/thorntail/replace_thorntail_fractions.mta.xml
index 1173ecadb..24ba9cbd9 100644
--- a/rules-reviewed/eapxp/thorntail/replace_thorntail_fractions.mta.xml
+++ b/rules-reviewed/eapxp/thorntail/replace_thorntail_fractions.mta.xml
@@ -13,6 +13,8 @@
         </dependencies>
         <sourceTechnology id="thorntail" />
         <targetTechnology id="eapxp" versionRange="[2,)" />
+        <tag>JBossEAP</tag>
+        <tag>Thorntail</tag>
     </metadata>
     <rules>
         <!-- https://issues.jboss.org/browse/WINDUPRULE-741 -->
diff --git a/rules-reviewed/eapxp/thorntail/replace_thorntail_maven_plugin.mta.xml b/rules-reviewed/eapxp/thorntail/replace_thorntail_maven_plugin.mta.xml
index 9d43e57b7..cb12086b8 100644
--- a/rules-reviewed/eapxp/thorntail/replace_thorntail_maven_plugin.mta.xml
+++ b/rules-reviewed/eapxp/thorntail/replace_thorntail_maven_plugin.mta.xml
@@ -14,6 +14,8 @@
         </dependencies>
         <sourceTechnology id="thorntail" />
         <targetTechnology id="eapxp" versionRange="[2,)" />
+        <tag>JBossEAP</tag>
+        <tag>Thorntail</tag>
     </metadata>
     <rules>
         <!-- https://issues.jboss.org/browse/WINDUPRULE-739 -->
diff --git a/rules-reviewed/fuse-service-works/soa-p-5/soa-p-5.windup.xml b/rules-reviewed/fuse-service-works/soa-p-5/soa-p-5.windup.xml
index b17495c4f..6fedbfc78 100644
--- a/rules-reviewed/fuse-service-works/soa-p-5/soa-p-5.windup.xml
+++ b/rules-reviewed/fuse-service-works/soa-p-5/soa-p-5.windup.xml
@@ -13,6 +13,7 @@
         </dependencies>
         <sourceTechnology id="soa-p" versionRange="(,5]" />
         <targetTechnology id="fsw" versionRange="[6,)" />
+        <tag>jboss-esb</tag>
     </metadata>
 
     <rules>
diff --git a/rules-reviewed/fuse/sonic-catchall.windup.xml b/rules-reviewed/fuse/sonic-catchall.windup.xml
index a011270b2..43bb58dff 100644
--- a/rules-reviewed/fuse/sonic-catchall.windup.xml
+++ b/rules-reviewed/fuse/sonic-catchall.windup.xml
@@ -14,6 +14,7 @@
       <sourceTechnology id="sonic" />
       <targetTechnology id="camel" versionRange="[2,)" />
       <targetTechnology id="fuse" versionRange="[6,)" />
+       <tag>sonic</tag>
    </metadata>
 
    <rules>
diff --git a/rules-reviewed/fuse/sonicesb/sonic-esb.windup.xml b/rules-reviewed/fuse/sonicesb/sonic-esb.windup.xml
index f8e7a12ea..4542f8810 100644
--- a/rules-reviewed/fuse/sonicesb/sonic-esb.windup.xml
+++ b/rules-reviewed/fuse/sonicesb/sonic-esb.windup.xml
@@ -11,6 +11,8 @@
         </dependencies>
         <sourceTechnology id="sonic" />
         <targetTechnology id="fuse" versionRange="[6,)" />
+        <tag>sonic-esb</tag>
+        <tag>camel</tag>
     </metadata>
     <rules>
         <rule id="sonic-esb-01000">
diff --git a/rules-reviewed/fuse/sonicesb/xml-sonic-esb.windup.xml b/rules-reviewed/fuse/sonicesb/xml-sonic-esb.windup.xml
index 1ad60f381..85583cedb 100644
--- a/rules-reviewed/fuse/sonicesb/xml-sonic-esb.windup.xml
+++ b/rules-reviewed/fuse/sonicesb/xml-sonic-esb.windup.xml
@@ -12,6 +12,7 @@
         </dependencies>
         <sourceTechnology id="sonicesb" />
         <targetTechnology id="fuse" versionRange="[6,)" />
+        <tag>sonic-esb</tag>
     </metadata>
 
     <rules>
diff --git a/rules-reviewed/hibernate/hibernate.windup.xml b/rules-reviewed/hibernate/hibernate.windup.xml
index ffffd9017..dc58d16bf 100644
--- a/rules-reviewed/hibernate/hibernate.windup.xml
+++ b/rules-reviewed/hibernate/hibernate.windup.xml
@@ -13,6 +13,7 @@
       <sourceTechnology id="hibernate" versionRange="[,3.9)" />
       <targetTechnology id="hibernate" versionRange="[4,)" />
       <targetTechnology id="eap" versionRange="[6,7)" />
+       <tag>hibernate</tag>
    </metadata>
 
    <rules>
diff --git a/rules-reviewed/openjdk7/oraclejdk7/oracle2openjdk.rhamt.xml b/rules-reviewed/openjdk7/oraclejdk7/oracle2openjdk.rhamt.xml
index ca06ffc5e..9b8548827 100644
--- a/rules-reviewed/openjdk7/oraclejdk7/oracle2openjdk.rhamt.xml
+++ b/rules-reviewed/openjdk7/oraclejdk7/oracle2openjdk.rhamt.xml
@@ -11,6 +11,8 @@
         </dependencies>
         <sourceTechnology id="oraclejdk" versionRange="[7,)"/>
         <targetTechnology id="openjdk" versionRange="[7,)" />
+        <tag>oracle-jdk</tag>
+        <tag>jdk</tag>
     </metadata>
     <rules>
         <!-- remove / change this rule if OpenJFX is shipped with RHEL. -->
@@ -71,7 +73,7 @@
                         OpenJDK does not support the resource management API for Java.
                     </message>
                     <link href="https://access.redhat.com/solutions/2489791" title="Knowledge base article OracleJDK vs. OpenJDK" />
-                    <tag>Oracle JDK resource management</tag>
+                    <tag>Oracle-JDK-resource-management</tag>
                 </hint>
             </perform>
         </rule>
@@ -86,7 +88,7 @@
                         OpenJDK uses LCMS. If you continued to use KCMS by using the property ``sun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider``, remove this property and ensure in your tests that your application still works as expected.
                     </message>
                     <link href="https://access.redhat.com/solutions/2489791" title="Knowledge base article OracleJDK vs. OpenJDK" />
-                    <tag>JDK color management</tag>
+                    <tag>JDK-color-management</tag>
                 </hint>
             </perform>
         </rule>
@@ -103,7 +105,7 @@
                        Ensure during your tests that the application behaves as expected.
                     </message>
                     <link href="https://access.redhat.com/solutions/2489791" title="Knowledge base article OracleJDK vs. OpenJDK" />
-                    <tag>2D library</tag>
+                    <tag>2DLibrary</tag>
                 </hint>
             </perform>
             <where param="package">
diff --git a/rules-reviewed/openshift/java-rmi.windup.xml b/rules-reviewed/openshift/java-rmi.windup.xml
index db7391780..ca9327bc9 100644
--- a/rules-reviewed/openshift/java-rmi.windup.xml
+++ b/rules-reviewed/openshift/java-rmi.windup.xml
@@ -12,6 +12,8 @@
         <sourceTechnology id="java" />
         <sourceTechnology id="rmi" />
         <targetTechnology id="cloud-readiness" />
+        <tag>cloud</tag>
+        <tag>rmi</tag>
     </metadata>
     <rules>
         <rule id="java-rmi-00000">
diff --git a/rules-reviewed/openshift/local-storage.windup.xml b/rules-reviewed/openshift/local-storage.windup.xml
index 8ef4ecf68..1ba74c628 100644
--- a/rules-reviewed/openshift/local-storage.windup.xml
+++ b/rules-reviewed/openshift/local-storage.windup.xml
@@ -10,6 +10,7 @@
             <addon id="org.jboss.windup.rules,windup-rules-java,3.0.0.Final" />
         </dependencies>
         <targetTechnology id="cloud-readiness" />
+        <tag>storage</tag>
     </metadata>
      <!--
        This rules could be merged together but they need to be separated due to issue WINDUP-1324 [https://issues.jboss.org/projects/WINDUP/issues/WINDUP-1324]
diff --git a/rules-reviewed/os/windows/os-specific.windup.xml b/rules-reviewed/os/windows/os-specific.windup.xml
index 2e0fc1859..568455422 100644
--- a/rules-reviewed/os/windows/os-specific.windup.xml
+++ b/rules-reviewed/os/windows/os-specific.windup.xml
@@ -11,6 +11,7 @@
         </dependencies>
         <!-- version ranges applied to from and to technologies -->
         <targetTechnology id="linux" />
+        <tag>ms-windows</tag>
     </metadata>
     <rules>
         <rule id="os-specific-00001">
diff --git a/rules-reviewed/quarkus/springboot/springboot-generic-catchall.windup.xml b/rules-reviewed/quarkus/springboot/springboot-generic-catchall.windup.xml
index c38e943ab..75623b96b 100644
--- a/rules-reviewed/quarkus/springboot/springboot-generic-catchall.windup.xml
+++ b/rules-reviewed/quarkus/springboot/springboot-generic-catchall.windup.xml
@@ -14,6 +14,7 @@
         <sourceTechnology id="springboot" />
         <targetTechnology id="quarkus" />
         <phase>PostMigrationRulesPhase</phase>
+        <tag>springboot</tag>
     </metadata>
     <rules>
         <rule id="springboot-generic-catchall-00100">