diff --git a/api/BUILD b/api/BUILD
index 7a6671dd681f..d8782fb96b23 100644
--- a/api/BUILD
+++ b/api/BUILD
@@ -133,18 +133,12 @@ proto_library(
         "//envoy/config/common/matcher/v3:pkg",
         "//envoy/config/core/v3:pkg",
         "//envoy/config/endpoint/v3:pkg",
-        "//envoy/config/filter/thrift/router/v2alpha1:pkg",
         "//envoy/config/grpc_credential/v3:pkg",
-        "//envoy/config/health_checker/redis/v2:pkg",
         "//envoy/config/listener/v3:pkg",
         "//envoy/config/metrics/v3:pkg",
         "//envoy/config/overload/v3:pkg",
         "//envoy/config/ratelimit/v3:pkg",
         "//envoy/config/rbac/v3:pkg",
-        "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg",
-        "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg",
-        "//envoy/config/retry/omit_canary_hosts/v2:pkg",
-        "//envoy/config/retry/previous_hosts/v2:pkg",
         "//envoy/config/route/v3:pkg",
         "//envoy/config/tap/v3:pkg",
         "//envoy/config/trace/v3:pkg",
diff --git a/api/xds_protocol.rst b/api/xds_protocol.rst
index edd12f6bb5c3..71c5f646627b 100644
--- a/api/xds_protocol.rst
+++ b/api/xds_protocol.rst
@@ -772,12 +772,12 @@ Later the xDS client spontaneously requests the "wc" resource.
 
 On reconnect the Incremental xDS client may tell the server of its known
 resources to avoid resending them over the network by sending them in
-:ref:`initial_resource_versions <envoy_api_field_DeltaDiscoveryRequest.initial_resource_versions>`.
+:ref:`initial_resource_versions <envoy_v3_api_field_service.discovery.v3.deltadiscoveryrequest.initial_resource_versions>`.
 Because no state is assumed to be preserved from the previous stream, the reconnecting
 client must provide the server with all resource names it is interested in. Note that for wildcard
 requests (CDS/LDS/SRDS), the request must have no resources in both
-:ref:`resource_names_subscribe <envoy_api_field_DeltaDiscoveryRequest.resource_names_subscribe>` and
-:ref:`resource_names_unsubscribe <envoy_api_field_DeltaDiscoveryRequest.resource_names_unsubscribe>`.
+:ref:`resource_names_subscribe <envoy_v3_api_field_service.discovery.v3.deltadiscoveryrequest.resource_names_subscribe>` and
+:ref:`resource_names_unsubscribe <envoy_v3_api_field_service.discovery.v3.deltadiscoveryrequest.resource_names_unsubscribe>`.
 
 .. figure:: diagrams/incremental-reconnect.svg
    :alt: Incremental reconnect example
diff --git a/docs/root/api-v3/config/filter/thrift/thrift.rst b/docs/root/api-v3/config/filter/thrift/thrift.rst
index 7e40e6f95194..688961fd16c1 100644
--- a/docs/root/api-v3/config/filter/thrift/thrift.rst
+++ b/docs/root/api-v3/config/filter/thrift/thrift.rst
@@ -5,5 +5,4 @@ Thrift filters
   :glob:
   :maxdepth: 2
 
-  router/v2alpha1/*
   ../../../extensions/filters/network/thrift_proxy/**/v3/*
diff --git a/docs/root/api-v3/config/health_checker/health_checker.rst b/docs/root/api-v3/config/health_checker/health_checker.rst
index b533d675ad7b..4f4230a6137f 100644
--- a/docs/root/api-v3/config/health_checker/health_checker.rst
+++ b/docs/root/api-v3/config/health_checker/health_checker.rst
@@ -5,5 +5,4 @@ Health checkers
   :glob:
   :maxdepth: 2
 
-  */v2/*
   ../../extensions/health_checkers/*/v3/*
diff --git a/docs/root/api-v3/config/resource_monitor/resource_monitor.rst b/docs/root/api-v3/config/resource_monitor/resource_monitor.rst
index c755d656cc8b..767f4ffeb182 100644
--- a/docs/root/api-v3/config/resource_monitor/resource_monitor.rst
+++ b/docs/root/api-v3/config/resource_monitor/resource_monitor.rst
@@ -8,4 +8,3 @@ Resource monitors
   :maxdepth: 2
 
   ../../extensions/resource_monitors/*/v3/*
-  */v2alpha/*
diff --git a/docs/root/api-v3/config/retry/retry.rst b/docs/root/api-v3/config/retry/retry.rst
index 2ba4572ab2ed..b26870b1e956 100644
--- a/docs/root/api-v3/config/retry/retry.rst
+++ b/docs/root/api-v3/config/retry/retry.rst
@@ -6,5 +6,4 @@ Retry Predicates
   :maxdepth: 2
 
   */empty/*
-  */v2/*
   ../../extensions/retry/**/v3/*