diff --git a/testregistry.textproto b/testregistry.textproto
index 391cdb6811d..2c9a9e0a900 100644
--- a/testregistry.textproto
+++ b/testregistry.textproto
@@ -147,12 +147,24 @@ test: {
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/security/gnsi/authz/tests/README.md"
   exec: " "
 }
+test: {
+  id: "Authz"
+  description: "General Authz (1-4) tests"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/gnsi/authz/tests/authz/README.md"
+  exec: "feature/gnsi/authz/tests/authz/metadata.textproto"
+}
 test: {
   id: "Authz-4"
   description: "reboot persistent"
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/security/gnsi/authz/tests/README.md"
   exec: " "
 }
+test: {
+  id: "BMP-1.1"
+  description: "BMP Session Establishment and Telemetry Test"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/bgp/bmp/otg_tests/bmp_base_session_test/README.md"
+  exec: "feature/bgp/bmp/otg_tests/bmp_base_session_test/metadata.textproto"
+}
 test: {
   id: "BMP-2.1"
   description: "BMP session establishment"
@@ -221,6 +233,18 @@ test: {
   id: "Certz-5"
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/ssecurity/gnsi/certz/trust_bundle_rotation/README.md"
 }
+test: {
+  id: "CFM-1.1"
+  description: "CFM over ETHoCWoMPLSoGRE"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/cfm/otg_tests/cfm_base/README.md"
+  exec: "feature/cfm/otg_tests/cfm_base/metadata.textproto"
+}
+test: {
+  id: "CNTR-3"
+  description: "Container Supervisor Failover"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/container/failover/tests/supervisor_failover/README.md"
+  exec: "feature/container/failover/tests/supervisor_failover/metadata.textproto"
+}
 test: {
   id: "CPT-1.1"
   description: "Ingress Interface ARP Policer"
@@ -364,6 +388,18 @@ test: {
   description: "Ingress policing with two rate, three color classifier"
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/qos/ingress_policer/otg_tests/ingress_police_two_rate_three_color_with_classifier/README.md"
 }
+test: {
+  id: "enrollz-1"
+  description: "enrollz test for TPM 2.0 HMAC-based Enrollment flow"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/security/attestz/tests/enrollz_tpm20_hmac/README.md"
+  exec: "feature/security/attestz/tests/enrollz_tpm20_hmac/metadata.textproto"
+}
+test: {
+  id: "enrollz-2"
+  description: "enrollz test for TPM 1.2 Enrollment flow"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/security/attestz/tests/enrollz_tpm12/README.md"
+  exec: "feature/security/attestz/tests/enrollz_tpm12/metadata.textproto"
+}
 test: {
   id: "FP-1.1"
   description: "Power admin DOWN/UP Test"
@@ -398,6 +434,24 @@ test: {
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/platform/integrated_circuit/otg_tests/utilization_threshold/README.md"
   exec: " "
 }
+test: {
+  id: "IPSEC-1.1"
+  description: "IPSec with MACSec over aggregated links."
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/ipsec/otg_tests/ipsec_base/README.md"
+  exec: "feature/ipsec/otg_tests/ipsec_base/metadata.textproto"
+}
+test: {
+  id: "IPSEC-1.2"
+  description: "IPSec Scaling with MACSec over aggregated links."
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/ipsec/otg_tests/ipsec_scale/README.md"
+  exec: "feature/ipsec/otg_tests/ipsec_scale/metadata.textproto"
+}
+test: {
+  id: "IPSEC-1.3"
+  description: "IPSec Packet-Order with MACSec over aggregated links."
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/ipsec/otg_tests/ipsec_packetorder/README.md"
+  exec: "feature/ipsec/otg_tests/ipsec_packetorder/metadata.textproto"
+}
 test: {
   id: "MGT-1"
   description: "Management HA test"
@@ -416,6 +470,12 @@ test: {
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/mpls/otg_tests/mpls_tc/README.md"
   exec: " "
 }
+test: {
+  id: "MPLS-2.2"
+  description: "MPLS forwarding via static LSP to BGP next-hop."
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/mpls/otg_tests/static_bgp_nexthop/README.md"
+  exec: "feature/mpls/otg_tests/static_bgp_nexthop/metadata.textproto"
+}
 test: {
   id: "MTU-1.3"
   description: "Large IP Packet Transmission"
@@ -480,6 +540,12 @@ test: {
   id: "P4RT-3.2"
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/p4rt/otg_tests/google_discovery_protocol_packetout_test/README.md"
 }
+test: {
+  id: "P4RT-3.21"
+  description: "Google Discovery Protocol: PacketOut with LAG"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/p4rt/otg_tests/google_discovery_protocol_packetout_lag_test/README.md"
+  exec: "feature/p4rt/otg_tests/google_discovery_protocol_packetout_lag_test/metadata.textproto"
+}
 test: {
   id: "P4RT-5.1"
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/p4rt/otg_tests/traceroute_packetin_test/README.md"
@@ -516,6 +582,12 @@ test: {
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/policy_forwarding/encapsulation/otg_tests/encap_gre_ipv4/README.md"
   exec: " "
 }
+test: {
+  id: "PF-1.3"
+  description: "Policy-based IPv4 GRE Decapsulation"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/policy_forwarding/encapsulation/otg_tests/decap_gre_ipv4/README.md"
+  exec: "feature/policy_forwarding/encapsulation/otg_tests/decap_gre_ipv4/metadata.textproto"
+}
 test: {
   id: "PF-1.4"
   description: "GUEv1 Decapsulation rule using destination-address-prefix-set and TTL and DSCP behavior test"
@@ -634,6 +706,12 @@ test: {
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/policy_forwarding/ethomplsogre/otg_tests/encap_decap_gre/README.md"
   exec: " "
 }
+test: {
+  id: "PF-1.24"
+  description: "Add and remove interface bound to PBF"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/policy_forwarding/otg_tests/add_remove_policy_bound_interface_test/README.md"
+  exec: "feature/policy_forwarding/otg_tests/add_remove_policy_bound_interface_test/metadata.textproto"
+}
 test: {
   id: "PF-2.3"
   description: "Multiple VRFs and GUE DECAP in Default VRF"
@@ -658,6 +736,18 @@ test: {
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/interface/helper_address/otg_tests/relay_agent_test/README.md" 
   exec: " "
 }
+test: {
+  id: "PLT-1.3"
+  description: "OnChange Subscription Test for Breakout Interfaces"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/platform/tests/breakout_subscription_test/README.md"
+  exec: "feature/platform/tests/breakout_subscription_test/metadata.textproto"
+}
+test: {
+  id: "RT-1.1"
+  description: "Base BGP Session Parameters"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/bgp/otg_tests/base_bgp_session_parameters/README.md"
+  exec: "feature/bgp/otg_tests/base_bgp_session_parameters/metadata.textproto"
+}
 test: {
   id: "RT-1.2"
   description: "BGP Policy & Route Installation"
@@ -773,6 +863,18 @@ test: {
   readme: ""
   exec: " "
 }
+test: {
+  id: "RT-2.18"
+  description: "Scale for IS-IS with multiple adjacencies"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/isis/otg_tests/isis_scale_multi_adjacency_test/README.md"
+  exec: "feature/isis/otg_tests/isis_scale_multi_adjacency_test/metadata.textproto"
+}
+test: {
+  id: "RT-10.2"
+  description: "Non-default Route Generation based on 192.168.2.2/32 Presence in ISIS"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/isis/policy/otg_tests/generate_route/README.md"
+  exec: "feature/isis/policy/otg_tests/generate_route/metadata.textproto"
+}
 test: {
   id: "RT-1.22"
   description: ": BGP Link Bandwidth Community for recursive routes"
@@ -809,6 +911,12 @@ test: {
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/bgp/static_route_bgp_redistribution/otg_tests/static_route_bgp_redistribution_test/README.md"
   exec: " "
 }
+test: {
+  id: "SR-1.2"
+  description: "Egress Node Forwarding for MPLS traffic with Explicit Null label"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/mpls/sr/otg_tests/srte_egress_node_forwarding/README.md"
+  exec: "feature/mpls/sr/otg_tests/srte_egress_node_forwarding/metadata.textproto"
+}
 test: {
   id: "RT-1.28"
   description: "BGP to IS-IS redistribution"
@@ -1291,6 +1399,18 @@ test: {
   description: "Default Route Generation based on 192.0.0.0/8 Presence"
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/policy_forwarding/generate_route/otg_tests/generate_default_route/README.md"
 }
+test: {
+  id: "Replay-1.0"
+  description: "Record/replay presession test"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/replay/tests/presession_test/README.md"
+  exec: "feature/replay/tests/presession_test/metadata.textproto"
+}
+test: {
+  id: "Replay-1.1"
+  description: "Record/replay diff command trees test"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/replay/tests/diff_command_trees/README.md"
+  exec: "feature/replay/tests/diff_command_trees/metadata.textproto"
+}
 test: {
   id: "Replay-1.2"
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/replay/tests/p4rt_replay/README.md"
@@ -1517,6 +1637,54 @@ test: {
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/gribi/ate_tests/get_rpc_test/README.md"
   exec: " "
 }
+test: {
+  id: "TE-2.2"
+  description: "gRIBI IPv4 Entry With Aggregate Ports"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/gribi/otg_tests/ipv4_entry_with_aggregate_ports_test/README.md"
+  exec: "feature/gribi/otg_tests/ipv4_entry_with_aggregate_ports_test/metadata.textproto"
+}
+test: {
+  id: "TE-8.1"
+  description: "DUT Daemon Failure"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/gribi/otg_tests/dut_daemon_failure/README.md"
+  exec: "feature/gribi/otg_tests/dut_daemon_failure/metadata.textproto"
+}
+test: {
+  id: "TE-11.1"
+  description: "Backup NHG: Single NH"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/gribi/otg_tests/backup_nhg_single_nh_test/README.md"
+  exec: "feature/gribi/otg_tests/backup_nhg_single_nh_test/metadata.textproto"
+}
+test: {
+  id: "TE-11.21"
+  description: "Backup NHG: Multiple NH with PBF"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/gribi/otg_tests/backup_nhg_multiple_nh_pbf_test/README.md"
+  exec: "feature/gribi/otg_tests/backup_nhg_multiple_nh_pbf_test/metadata.textproto"
+}
+test: {
+  id: "TE-11.3"
+  description: "Backup NHG: Actions"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/gribi/otg_tests/backup_nhg_action/README.md"
+  exec: "feature/gribi/otg_tests/backup_nhg_action/metadata.textproto"
+}
+test: {
+  id: "TE-11.31"
+  description: "Backup NHG: Actions with PBF"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/gribi/otg_tests/backup_nhg_action_pbf/README.md"
+  exec: "feature/gribi/otg_tests/backup_nhg_action_pbf/metadata.textproto"
+}
+test: {
+  id: "TE-18.4"
+  description: "ECMP hashing on outer and inner packets with MPLSoUDP encapsulation"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/gribi/mpls_in_udp/otg_tests/mpls_over_udp_tunnel_hashing_test/README.md"
+  exec: "feature/gribi/mpls_in_udp/otg_tests/mpls_over_udp_tunnel_hashing_test/metadata.textproto"
+}
+test: {
+  id: "TestID-16.4"
+  description: "gRIBI to BGP Route Redistribution for IPv4"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/gribi/otg_tests/gribi_to_bgp_redistribution/README.md"
+  exec: "feature/gribi/otg_tests/gribi_to_bgp_redistribution/metadata.textproto"
+}
 test: {
   id: "TE-6.1"
   description: "Route Removal via Flush"
@@ -1902,6 +2070,18 @@ test: {
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/system/gnmi/cliorigin/ate_tests/cli_origin_test/README.md"
   exec: " "
 }
+test: {
+  id: "gNMI-1.2"
+  description: "Benchmarking: Full Configuration Replace"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/gnmi/tests/full_configuration_replace_test/README.md"
+  exec: "feature/gnmi/tests/full_configuration_replace_test/metadata.textproto"
+}
+test: {
+  id: "gNMI-1.3"
+  description: "Benchmarking: Drained Configuration Convergence Time"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/gnmi/otg_tests/drained_configuration_convergence_time/README.md"
+  exec: "feature/gnmi/otg_tests/drained_configuration_convergence_time/metadata.textproto"
+}
 test: {
   id: "gNMI-1.10"
   description: "Telemetry: Basic Check"
@@ -1950,6 +2130,12 @@ test: {
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/system/gnmi/set/tests/gnmi_set_test/metadata.textproto"
   exec: " "
 }
+test: {
+  id: "gNMI-1.24"
+  description: "gNMI Leaf-List Update Test"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/gnmi/tests/leaflist_update_test/README.md"
+  exec: "feature/gnmi/tests/leaflist_update_test/metadata.textproto"
+}
 test: {
   id: "gNMI-1.16"
   description: "Fabric module redundancy"
@@ -2073,6 +2259,12 @@ test: {
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/gnoi/os/tests/osinstall/README.md"
   exec: " "
 }
+test: {
+  id: "gNOI-7.1"
+  description: "BootConfig"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/gnoi/secure_boot/tests/bootconfig/README.md"
+  exec: "feature/gnoi/secure_boot/tests/bootconfig/metadata.textproto"
+}
 test: {
   id: "gNOI-5.1"
   description: "Ping Test"
@@ -2179,6 +2371,54 @@ test: {
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/system/control_plane_traffic/otg_tests/ingress_acl/README.md"
   exec: "https://github.com/openconfig/featureprofiles/blob/main/feature/system/control_plane_traffic/otg_tests/ingress_acl/control_plane_traffic_ingress_acl_test.go"
 }
+test: {
+  id: "SYS-3.1"
+  description: "AAA and TACACS+ Configuration Verification Test Suite"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/system/aaa/tests/tacacs/README.md"
+  exec: "feature/system/aaa/tests/tacacs/metadata.textproto"
+}
+test: {
+  id: "SYS-4.1"
+  description: "System Mount Points State Verification"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/system/mount_points/tests/system_mount_points_state/README.md"
+  exec: "feature/system/mount_points/tests/system_mount_points_state/metadata.textproto"
+}
+test: {
+  id: "bootz"
+  description: "General bootz bootstrap tests"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/system/secure_boot/tests/bootz/README.md"
+  exec: "feature/system/secure_boot/tests/bootz/metadata.textproto"
+}
+test: {
+  id: "System-1.1"
+  description: "System banner test"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/system/system_base_test/tests/system_banner_test/README.md"
+  exec: "feature/system/system_base_test/tests/system_banner_test/metadata.textproto"
+}
+test: {
+  id: "System-1.2"
+  description: "System g protocol test"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/system/system_base_test/tests/system_g_protocol_test/README.md"
+  exec: "feature/system/system_base_test/tests/system_g_protocol_test/metadata.textproto"
+}
+test: {
+  id: "System-1.3"
+  description: "System hostname test"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/system/system_base_test/tests/hostname_test/README.md"
+  exec: "feature/system/system_base_test/tests/hostname_test/metadata.textproto"
+}
+test: {
+  id: "System-1.4"
+  description: "System time test"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/system/system_base_test/tests/system_time_test/README.md"
+  exec: "feature/system/system_base_test/tests/system_time_test/metadata.textproto"
+}
+test: {
+  id: "System-1.5"
+  description: "System software-version test"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/system/system_base_test/tests/system_software_version/README.md"
+  exec: "feature/system/system_base_test/tests/system_software_version/metadata.textproto"
+}
 test: {
   id: "TRANSCEIVER-1.2"
   description: "Telemetry: 400ZR_PLUS Chromatic Dispersion(CD) telemetry values streaming"
@@ -2209,6 +2449,12 @@ test: {
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/platform/transceiver/tests/zrp_inventory_test/README.md"
   exec: "https://github.com/openconfig/featureprofiles/blob/main/feature/platform/transceiver/tests/zrp_inventory_test/zrp_inventory_test.go"
 }
+test: {
+  id: "TRANSCEIVER-7.1"
+  description: "Telemetry: 400ZR Optics inventory info streaming"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/platform/transceiver/tests/zr_inventory_test/README.md"
+  exec: "feature/platform/transceiver/tests/zr_inventory_test/metadata.textproto"
+}
 test: {
   id: "TRANSCEIVER-9.2"
   description: "Telemetry: 400ZR_PLUS TX laser bias current telemetry values streaming."
@@ -2293,6 +2539,18 @@ test: {
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/interface/otg_tests/telemetry_interface_carrier_transitions_test/README.md"
   exec: "https://github.com/openconfig/featureprofiles/blob/main/feature/interface/otg_tests/telemetry_interface_carrier_transitions_test/carrier_transitions_test.go"
 }
+test: {
+  id: "gNMI-1.27"
+  description: "gNMI Sample Mode Test"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/gnmi/subscribe/tests/gnmi_sample_mode_test/README.md"
+  exec: "feature/gnmi/subscribe/tests/gnmi_sample_mode_test/metadata.textproto"
+}
+test: {
+  id: "GNMI-2"
+  description: "gnmi_subscriptionlist_test"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/gnmi/subscribe/tests/gnmi_subscriptionlist_test/README.md"
+  exec: "feature/gnmi/subscribe/tests/gnmi_subscriptionlist_test/metadata.textproto"
+}
 test: {
   id: "TE-13.1"
   description: "gRIBI route ADD during Failover"
@@ -2311,33 +2569,3 @@ test: {
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/mpls/sr/otg_tests/isis_node_sid_forward/README.md"
   exec: "https://github.com/openconfig/featureprofiles/blob/main/feature/mpls/sr/otg_tests/isis_node_sid_forward/isis_node_sid_forward_test.go"
 }
-test: {
-  id: "MPLS-2.2"
-  description: "MPLS forwarding via static LSP to BGP next-hop."
-  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/mpls/otg_tests/static_bgp_nexthop/README.md"
-  exec: "https://github.com/openconfig/featureprofiles/blob/main/feature/mpls/otg_tests/static_bgp_nexthop/static_bgp_nexthop_test.go"
-}
-test: {
-  id: "PF-1.3"
-  description: "Policy-based IPv4 GRE Decapsulation"
-  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/policy_forwarding/encapsulation/otg_tests/decap_gre_ipv4/README.md"
-  exec: "https://github.com/openconfig/featureprofiles/blob/main/feature/policy_forwarding/encapsulation/otg_tests/decap_gre_ipv4/decap_gre_ipv4_test.go"
-}
-test: {
-  id: "BMP-1.1"
-  description: "BMP Session Establishment and Telemetry Test"
-  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/bgp/bmp/otg_tests/bmp_base_session_test/README.md"
-  exec: "https://github.com/openconfig/featureprofiles/blob/main/feature/bgp/bmp/otg_tests/bmp_base_session_test/bmp_base_session_test.go"
-}
-test: {
-  id: "RT-10.2"
-  description: "Non-default Route Generation based on 192.168.2.2/32 Presence in ISIS"
-  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/isis/policy/otg_tests/generate_route/README.md"
-  exec: "https://github.com/openconfig/featureprofiles/blob/main/feature/isis/policy/otg_tests/generate_route/generate_route_test.go"
-}
-test: {
-  id: "SR-1.2"
-  description: "Egress Node Forwarding for MPLS traffic with Explicit Null label"
-  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/mpls/sr/otg_tests/srte_egress_node_forwarding/README.md"
-  exec: "https://github.com/openconfig/featureprofiles/blob/main/feature/mpls/sr/otg_tests/srte_egress_node_forwarding/egress_node_forwading_test.go"
-}