diff --git a/feature/bgp/policybase/otg_tests/aspath_and_community_test/metadata.textproto b/feature/bgp/policybase/otg_tests/aspath_and_community_test/metadata.textproto
index 1a73604225b..4abaad5f826 100644
--- a/feature/bgp/policybase/otg_tests/aspath_and_community_test/metadata.textproto
+++ b/feature/bgp/policybase/otg_tests/aspath_and_community_test/metadata.textproto
@@ -1,6 +1,7 @@
 # proto-file: github.com/openconfig/featureprofiles/proto/metadata.proto
 # proto-message: Metadata
 
-plan_id: "RT-2.2"
-description: "BGP as-path and community-set policy"
+plan_id: "RT-2.4"
+description: "BGP Policy AS Path Set and Community Set"
 testbed: TESTBED_DUT_ATE_2LINKS
+tags: TAGS_AGGREGATION, TAGS_TRANSIT, TAGS_DATACENTER_EDGE
\ No newline at end of file
diff --git a/feature/bgp/policybase/otg_tests/aspath_test/metadata.textproto b/feature/bgp/policybase/otg_tests/aspath_test/metadata.textproto
new file mode 100644
index 00000000000..61d04df2354
--- /dev/null
+++ b/feature/bgp/policybase/otg_tests/aspath_test/metadata.textproto
@@ -0,0 +1,7 @@
+# proto-file: github.com/openconfig/featureprofiles/proto/metadata.proto
+# proto-message: Metadata
+
+plan_id: "RT-2.2"
+description: "BGP Policy AS Path Set"
+testbed: TESTBED_DUT_ATE_2LINKS
+tags: TAGS_AGGREGATION, TAGS_TRANSIT, TAGS_DATACENTER_EDGE
\ No newline at end of file
diff --git a/feature/bgp/policybase/otg_tests/community_test/metadata.textproto b/feature/bgp/policybase/otg_tests/community_test/metadata.textproto
new file mode 100644
index 00000000000..36bfdc44fab
--- /dev/null
+++ b/feature/bgp/policybase/otg_tests/community_test/metadata.textproto
@@ -0,0 +1,7 @@
+# proto-file: github.com/openconfig/featureprofiles/proto/metadata.proto
+# proto-message: Metadata
+
+plan_id: "RT-2.3"
+description: "BGP Policy Community Set"
+testbed: TESTBED_DUT_ATE_2LINKS
+tags: TAGS_AGGREGATION, TAGS_TRANSIT, TAGS_DATACENTER_EDGE
\ No newline at end of file