diff --git a/BUILD b/BUILD
index c1c09803..3a0f550a 100644
--- a/BUILD
+++ b/BUILD
@@ -366,9 +366,9 @@ proto_library(
     name = "xds_protos",
     visibility = ["//visibility:public"],
     deps = [
-        "@com_github_cncf_udpa//xds/core/v3:pkg",
-        "@com_github_cncf_udpa//xds/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//xds/type/v3:pkg",
+        "@com_github_cncf_xds//xds/core/v3:pkg",
+        "@com_github_cncf_xds//xds/type/matcher/v3:pkg",
+        "@com_github_cncf_xds//xds/type/v3:pkg",
     ],
 )
 
diff --git a/STYLE.md b/STYLE.md
index e8a0580b..f0c2b595 100644
--- a/STYLE.md
+++ b/STYLE.md
@@ -126,7 +126,7 @@ To add an extension config to the API, the steps below should be followed:
    licenses(["notice"])  # Apache 2
 
    api_proto_package(
-       deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+       deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
    )
    ```
 1. If this is still WiP and subject to breaking changes, please tag it
diff --git a/bazel/external_proto_deps.bzl b/bazel/external_proto_deps.bzl
index bea4868d..212850dd 100644
--- a/bazel/external_proto_deps.bzl
+++ b/bazel/external_proto_deps.bzl
@@ -22,7 +22,7 @@ EXTERNAL_PROTO_GO_BAZEL_DEP_MAP = {
     # Note @com_google_googleapis are point to @go_googleapis.
     #
     # It is aligned to xDS dependency to suppress the conflicting package heights error between
-    # @com_github_cncf_udpa//xds/type/matcher/v3:pkg_go_proto
+    # @com_github_cncf_xds//xds/type/matcher/v3:pkg_go_proto
     # @envoy_api//envoy/config/rbac/v3:pkg_go_proto
     #
     # TODO(https://github.com/bazelbuild/rules_go/issues/1986): update to
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index c6ab16fc..33aaa220 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -25,8 +25,15 @@ def api_dependencies():
         name = "com_google_googleapis",
     )
 
+    external_http_archive(
+        name = "com_github_cncf_xds",
+    )
+
+    # Needed until @com_github_grpc_grpc renames @com_github_cncf_udpa
+    # to @com_github_cncf_xds as well.
     external_http_archive(
         name = "com_github_cncf_udpa",
+        location_name = "com_github_cncf_xds",
     )
 
     external_http_archive(
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
index 6ed9c130..80bbdae5 100644
--- a/bazel/repository_locations.bzl
+++ b/bazel/repository_locations.bzl
@@ -34,7 +34,7 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         license = "Apache-2.0",
         license_url = "https://github.com/bufbuild/protoc-gen-validate/blob/v{version}/LICENSE",
     ),
-    com_github_cncf_udpa = dict(
+    com_github_cncf_xds = dict(
         project_name = "xDS API",
         project_desc = "xDS API Working Group (xDS-WG)",
         project_url = "https://github.com/cncf/xds",
diff --git a/contrib/envoy/extensions/config/v3alpha/BUILD b/contrib/envoy/extensions/config/v3alpha/BUILD
index cfd406e0..edd8d2b1 100644
--- a/contrib/envoy/extensions/config/v3alpha/BUILD
+++ b/contrib/envoy/extensions/config/v3alpha/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/common/key_value/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/contrib/envoy/extensions/filters/http/checksum/v3alpha/BUILD b/contrib/envoy/extensions/filters/http/checksum/v3alpha/BUILD
index 08121924..b1f16574 100644
--- a/contrib/envoy/extensions/filters/http/checksum/v3alpha/BUILD
+++ b/contrib/envoy/extensions/filters/http/checksum/v3alpha/BUILD
@@ -7,7 +7,7 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/contrib/envoy/extensions/filters/http/dynamo/v3/BUILD b/contrib/envoy/extensions/filters/http/dynamo/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/contrib/envoy/extensions/filters/http/dynamo/v3/BUILD
+++ b/contrib/envoy/extensions/filters/http/dynamo/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/contrib/envoy/extensions/filters/http/golang/v3alpha/BUILD b/contrib/envoy/extensions/filters/http/golang/v3alpha/BUILD
index ec1e778e..d49202b7 100644
--- a/contrib/envoy/extensions/filters/http/golang/v3alpha/BUILD
+++ b/contrib/envoy/extensions/filters/http/golang/v3alpha/BUILD
@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/contrib/envoy/extensions/filters/http/language/v3alpha/BUILD b/contrib/envoy/extensions/filters/http/language/v3alpha/BUILD
index ee92fb65..29ebf074 100644
--- a/contrib/envoy/extensions/filters/http/language/v3alpha/BUILD
+++ b/contrib/envoy/extensions/filters/http/language/v3alpha/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/contrib/envoy/extensions/filters/http/squash/v3/BUILD b/contrib/envoy/extensions/filters/http/squash/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/contrib/envoy/extensions/filters/http/squash/v3/BUILD
+++ b/contrib/envoy/extensions/filters/http/squash/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/contrib/envoy/extensions/filters/http/sxg/v3alpha/BUILD b/contrib/envoy/extensions/filters/http/sxg/v3alpha/BUILD
index 3ca8242f..63fb3642 100644
--- a/contrib/envoy/extensions/filters/http/sxg/v3alpha/BUILD
+++ b/contrib/envoy/extensions/filters/http/sxg/v3alpha/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/transport_sockets/tls/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/contrib/envoy/extensions/filters/network/client_ssl_auth/v3/BUILD b/contrib/envoy/extensions/filters/network/client_ssl_auth/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/contrib/envoy/extensions/filters/network/client_ssl_auth/v3/BUILD
+++ b/contrib/envoy/extensions/filters/network/client_ssl_auth/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/action/v3/BUILD b/contrib/envoy/extensions/filters/network/generic_proxy/action/v3/BUILD
index d0a7c688..b6c098a2 100644
--- a/contrib/envoy/extensions/filters/network/generic_proxy/action/v3/BUILD
+++ b/contrib/envoy/extensions/filters/network/generic_proxy/action/v3/BUILD
@@ -8,7 +8,7 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/config/route/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/BUILD b/contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/BUILD
index ec1e778e..d49202b7 100644
--- a/contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/BUILD
+++ b/contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/BUILD
@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3/BUILD b/contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3/BUILD
index 08121924..b1f16574 100644
--- a/contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3/BUILD
+++ b/contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3/BUILD
@@ -7,7 +7,7 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/router/v3/BUILD b/contrib/envoy/extensions/filters/network/generic_proxy/router/v3/BUILD
index ec1e778e..d49202b7 100644
--- a/contrib/envoy/extensions/filters/network/generic_proxy/router/v3/BUILD
+++ b/contrib/envoy/extensions/filters/network/generic_proxy/router/v3/BUILD
@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/v3/BUILD b/contrib/envoy/extensions/filters/network/generic_proxy/v3/BUILD
index 71c5730a..75f8163e 100644
--- a/contrib/envoy/extensions/filters/network/generic_proxy/v3/BUILD
+++ b/contrib/envoy/extensions/filters/network/generic_proxy/v3/BUILD
@@ -9,8 +9,8 @@ api_proto_package(
         "//envoy/config/accesslog/v3:pkg",
         "//envoy/config/core/v3:pkg",
         "//envoy/extensions/filters/network/http_connection_manager/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
-        "@com_github_cncf_udpa//xds/type/matcher/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//xds/type/matcher/v3:pkg",
     ],
 )
diff --git a/contrib/envoy/extensions/filters/network/golang/v3alpha/BUILD b/contrib/envoy/extensions/filters/network/golang/v3alpha/BUILD
index ec1e778e..d49202b7 100644
--- a/contrib/envoy/extensions/filters/network/golang/v3alpha/BUILD
+++ b/contrib/envoy/extensions/filters/network/golang/v3alpha/BUILD
@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/contrib/envoy/extensions/filters/network/kafka_broker/v3/BUILD b/contrib/envoy/extensions/filters/network/kafka_broker/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/contrib/envoy/extensions/filters/network/kafka_broker/v3/BUILD
+++ b/contrib/envoy/extensions/filters/network/kafka_broker/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha/BUILD b/contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha/BUILD
index ec1e778e..d49202b7 100644
--- a/contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha/BUILD
+++ b/contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha/BUILD
@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/contrib/envoy/extensions/filters/network/mysql_proxy/v3/BUILD b/contrib/envoy/extensions/filters/network/mysql_proxy/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/contrib/envoy/extensions/filters/network/mysql_proxy/v3/BUILD
+++ b/contrib/envoy/extensions/filters/network/mysql_proxy/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/BUILD b/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/BUILD
index ee92fb65..29ebf074 100644
--- a/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/BUILD
+++ b/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/BUILD b/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/BUILD
index 2f90ace8..fd0f6d5f 100644
--- a/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/BUILD
+++ b/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/config/core/v3:pkg",
         "//envoy/config/route/v3:pkg",
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/contrib/envoy/extensions/filters/network/sip_proxy/router/v3alpha/BUILD b/contrib/envoy/extensions/filters/network/sip_proxy/router/v3alpha/BUILD
index ee92fb65..29ebf074 100644
--- a/contrib/envoy/extensions/filters/network/sip_proxy/router/v3alpha/BUILD
+++ b/contrib/envoy/extensions/filters/network/sip_proxy/router/v3alpha/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha/BUILD b/contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha/BUILD
index 7753cfeb..79668d20 100644
--- a/contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha/BUILD
+++ b/contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     has_services = True,
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha/BUILD b/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha/BUILD
index 808cd297..4b04e5d2 100644
--- a/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha/BUILD
+++ b/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/contrib/envoy/extensions/matching/input_matchers/hyperscan/v3alpha/BUILD b/contrib/envoy/extensions/matching/input_matchers/hyperscan/v3alpha/BUILD
index ee92fb65..29ebf074 100644
--- a/contrib/envoy/extensions/matching/input_matchers/hyperscan/v3alpha/BUILD
+++ b/contrib/envoy/extensions/matching/input_matchers/hyperscan/v3alpha/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/contrib/envoy/extensions/network/connection_balance/dlb/v3alpha/BUILD b/contrib/envoy/extensions/network/connection_balance/dlb/v3alpha/BUILD
index ee92fb65..29ebf074 100644
--- a/contrib/envoy/extensions/network/connection_balance/dlb/v3alpha/BUILD
+++ b/contrib/envoy/extensions/network/connection_balance/dlb/v3alpha/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/contrib/envoy/extensions/private_key_providers/cryptomb/v3alpha/BUILD b/contrib/envoy/extensions/private_key_providers/cryptomb/v3alpha/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/contrib/envoy/extensions/private_key_providers/cryptomb/v3alpha/BUILD
+++ b/contrib/envoy/extensions/private_key_providers/cryptomb/v3alpha/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/contrib/envoy/extensions/private_key_providers/qat/v3alpha/BUILD b/contrib/envoy/extensions/private_key_providers/qat/v3alpha/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/contrib/envoy/extensions/private_key_providers/qat/v3alpha/BUILD
+++ b/contrib/envoy/extensions/private_key_providers/qat/v3alpha/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/contrib/envoy/extensions/regex_engines/hyperscan/v3alpha/BUILD b/contrib/envoy/extensions/regex_engines/hyperscan/v3alpha/BUILD
index ee92fb65..29ebf074 100644
--- a/contrib/envoy/extensions/regex_engines/hyperscan/v3alpha/BUILD
+++ b/contrib/envoy/extensions/regex_engines/hyperscan/v3alpha/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/contrib/envoy/extensions/router/cluster_specifier/golang/v3alpha/BUILD b/contrib/envoy/extensions/router/cluster_specifier/golang/v3alpha/BUILD
index ec1e778e..d49202b7 100644
--- a/contrib/envoy/extensions/router/cluster_specifier/golang/v3alpha/BUILD
+++ b/contrib/envoy/extensions/router/cluster_specifier/golang/v3alpha/BUILD
@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/contrib/envoy/extensions/vcl/v3alpha/BUILD b/contrib/envoy/extensions/vcl/v3alpha/BUILD
index ee92fb65..29ebf074 100644
--- a/contrib/envoy/extensions/vcl/v3alpha/BUILD
+++ b/contrib/envoy/extensions/vcl/v3alpha/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/admin/v2alpha/BUILD b/envoy/admin/v2alpha/BUILD
index 6fe8cb99..0d0be4ad 100644
--- a/envoy/admin/v2alpha/BUILD
+++ b/envoy/admin/v2alpha/BUILD
@@ -11,6 +11,6 @@ api_proto_package(
         "//envoy/config/bootstrap/v2:pkg",
         "//envoy/service/tap/v2alpha:pkg",
         "//envoy/type:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/admin/v3/BUILD b/envoy/admin/v3/BUILD
index 507cffde..d33f4e0b 100644
--- a/envoy/admin/v3/BUILD
+++ b/envoy/admin/v3/BUILD
@@ -11,6 +11,6 @@ api_proto_package(
         "//envoy/config/core/v3:pkg",
         "//envoy/config/tap/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/api/v2/BUILD b/envoy/api/v2/BUILD
index 0aded6e5..b90e220b 100644
--- a/envoy/api/v2/BUILD
+++ b/envoy/api/v2/BUILD
@@ -17,6 +17,6 @@ api_proto_package(
         "//envoy/config/filter/accesslog/v2:pkg",
         "//envoy/config/listener/v2:pkg",
         "//envoy/type:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/api/v2/auth/BUILD b/envoy/api/v2/auth/BUILD
index aaab1df1..ce0d681b 100644
--- a/envoy/api/v2/auth/BUILD
+++ b/envoy/api/v2/auth/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
         "//envoy/type/matcher:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/api/v2/cluster/BUILD b/envoy/api/v2/cluster/BUILD
index 2ffbc958..4810773b 100644
--- a/envoy/api/v2/cluster/BUILD
+++ b/envoy/api/v2/cluster/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
         "//envoy/type:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/api/v2/core/BUILD b/envoy/api/v2/core/BUILD
index 8475a4ba..fb33c9b2 100644
--- a/envoy/api/v2/core/BUILD
+++ b/envoy/api/v2/core/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/annotations:pkg",
         "//envoy/type:pkg",
         "//envoy/type/matcher:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/api/v2/endpoint/BUILD b/envoy/api/v2/endpoint/BUILD
index 83bc0ab9..10580ab4 100644
--- a/envoy/api/v2/endpoint/BUILD
+++ b/envoy/api/v2/endpoint/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/api/v2/listener/BUILD b/envoy/api/v2/listener/BUILD
index ea23dff7..220a4910 100644
--- a/envoy/api/v2/listener/BUILD
+++ b/envoy/api/v2/listener/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/api/v2/auth:pkg",
         "//envoy/api/v2/core:pkg",
         "//envoy/type:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/api/v2/ratelimit/BUILD b/envoy/api/v2/ratelimit/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/api/v2/ratelimit/BUILD
+++ b/envoy/api/v2/ratelimit/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/api/v2/route/BUILD b/envoy/api/v2/route/BUILD
index 3d4e6acf..a8df3ab5 100644
--- a/envoy/api/v2/route/BUILD
+++ b/envoy/api/v2/route/BUILD
@@ -11,6 +11,6 @@ api_proto_package(
         "//envoy/type:pkg",
         "//envoy/type/matcher:pkg",
         "//envoy/type/tracing/v2:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/accesslog/v2/BUILD b/envoy/config/accesslog/v2/BUILD
index 83bc0ab9..10580ab4 100644
--- a/envoy/config/accesslog/v2/BUILD
+++ b/envoy/config/accesslog/v2/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/accesslog/v3/BUILD b/envoy/config/accesslog/v3/BUILD
index e6578893..17fdbdc9 100644
--- a/envoy/config/accesslog/v3/BUILD
+++ b/envoy/config/accesslog/v3/BUILD
@@ -11,6 +11,6 @@ api_proto_package(
         "//envoy/data/accesslog/v3:pkg",
         "//envoy/type/matcher/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/bootstrap/v2/BUILD b/envoy/config/bootstrap/v2/BUILD
index 0c656d1a..f5623b97 100644
--- a/envoy/config/bootstrap/v2/BUILD
+++ b/envoy/config/bootstrap/v2/BUILD
@@ -13,6 +13,6 @@ api_proto_package(
         "//envoy/config/metrics/v2:pkg",
         "//envoy/config/overload/v2alpha:pkg",
         "//envoy/config/trace/v2:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/bootstrap/v3/BUILD b/envoy/config/bootstrap/v3/BUILD
index 23067e57..b4028076 100644
--- a/envoy/config/bootstrap/v3/BUILD
+++ b/envoy/config/bootstrap/v3/BUILD
@@ -16,6 +16,6 @@ api_proto_package(
         "//envoy/config/trace/v3:pkg",
         "//envoy/extensions/transport_sockets/tls/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/cluster/aggregate/v2alpha/BUILD b/envoy/config/cluster/aggregate/v2alpha/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/cluster/aggregate/v2alpha/BUILD
+++ b/envoy/config/cluster/aggregate/v2alpha/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD b/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD
index 25c228fd..4f912f7a 100644
--- a/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD
+++ b/envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/cluster/redis/BUILD b/envoy/config/cluster/redis/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/cluster/redis/BUILD
+++ b/envoy/config/cluster/redis/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/cluster/v3/BUILD b/envoy/config/cluster/v3/BUILD
index a98acddf..80d74b61 100644
--- a/envoy/config/cluster/v3/BUILD
+++ b/envoy/config/cluster/v3/BUILD
@@ -11,7 +11,7 @@ api_proto_package(
         "//envoy/config/endpoint/v3:pkg",
         "//envoy/type/metadata/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/core/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/core/v3:pkg",
     ],
 )
diff --git a/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD b/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD
index 631cd93a..37595060 100644
--- a/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD
+++ b/envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/common/key_value/v3/BUILD b/envoy/config/common/key_value/v3/BUILD
index e9b556d6..628f7132 100644
--- a/envoy/config/common/key_value/v3/BUILD
+++ b/envoy/config/common/key_value/v3/BUILD
@@ -7,7 +7,7 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/envoy/config/common/matcher/v3/BUILD b/envoy/config/common/matcher/v3/BUILD
index 2f90ace8..fd0f6d5f 100644
--- a/envoy/config/common/matcher/v3/BUILD
+++ b/envoy/config/common/matcher/v3/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/config/core/v3:pkg",
         "//envoy/config/route/v3:pkg",
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/common/mutation_rules/v3/BUILD b/envoy/config/common/mutation_rules/v3/BUILD
index 3f3a5395..e3bfc4e1 100644
--- a/envoy/config/common/mutation_rules/v3/BUILD
+++ b/envoy/config/common/mutation_rules/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/common/tap/v2alpha/BUILD b/envoy/config/common/tap/v2alpha/BUILD
index 3aed5a34..88cd9b52 100644
--- a/envoy/config/common/tap/v2alpha/BUILD
+++ b/envoy/config/common/tap/v2alpha/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/service/tap/v2alpha:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/core/v3/BUILD b/envoy/config/core/v3/BUILD
index 812e942f..15185f76 100644
--- a/envoy/config/core/v3/BUILD
+++ b/envoy/config/core/v3/BUILD
@@ -9,8 +9,8 @@ api_proto_package(
         "//envoy/annotations:pkg",
         "//envoy/type/matcher/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
-        "@com_github_cncf_udpa//xds/core/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//xds/core/v3:pkg",
     ],
 )
diff --git a/envoy/config/endpoint/v3/BUILD b/envoy/config/endpoint/v3/BUILD
index ad2fc9a9..eeae27ad 100644
--- a/envoy/config/endpoint/v3/BUILD
+++ b/envoy/config/endpoint/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/accesslog/v2/BUILD b/envoy/config/filter/accesslog/v2/BUILD
index f7c626ac..8b795653 100644
--- a/envoy/config/filter/accesslog/v2/BUILD
+++ b/envoy/config/filter/accesslog/v2/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/api/v2/core:pkg",
         "//envoy/api/v2/route:pkg",
         "//envoy/type:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/dubbo/router/v2alpha1/BUILD b/envoy/config/filter/dubbo/router/v2alpha1/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/dubbo/router/v2alpha1/BUILD
+++ b/envoy/config/filter/dubbo/router/v2alpha1/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/fault/v2/BUILD b/envoy/config/filter/fault/v2/BUILD
index 29613b4c..ad7d3cba 100644
--- a/envoy/config/filter/fault/v2/BUILD
+++ b/envoy/config/filter/fault/v2/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/annotations:pkg",
         "//envoy/type:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD b/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD
index 2ffbc958..4810773b 100644
--- a/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD
+++ b/envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
         "//envoy/type:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/http/aws_lambda/v2alpha/BUILD b/envoy/config/filter/http/aws_lambda/v2alpha/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/http/aws_lambda/v2alpha/BUILD
+++ b/envoy/config/filter/http/aws_lambda/v2alpha/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/http/aws_request_signing/v2alpha/BUILD b/envoy/config/filter/http/aws_request_signing/v2alpha/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/http/aws_request_signing/v2alpha/BUILD
+++ b/envoy/config/filter/http/aws_request_signing/v2alpha/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/http/buffer/v2/BUILD b/envoy/config/filter/http/buffer/v2/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/http/buffer/v2/BUILD
+++ b/envoy/config/filter/http/buffer/v2/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/http/cache/v2alpha/BUILD b/envoy/config/filter/http/cache/v2alpha/BUILD
index 5cbf4e82..a4882c58 100644
--- a/envoy/config/filter/http/cache/v2alpha/BUILD
+++ b/envoy/config/filter/http/cache/v2alpha/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/route:pkg",
         "//envoy/type/matcher:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/http/compressor/v2/BUILD b/envoy/config/filter/http/compressor/v2/BUILD
index 83bc0ab9..10580ab4 100644
--- a/envoy/config/filter/http/compressor/v2/BUILD
+++ b/envoy/config/filter/http/compressor/v2/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/http/cors/v2/BUILD b/envoy/config/filter/http/cors/v2/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/http/cors/v2/BUILD
+++ b/envoy/config/filter/http/cors/v2/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/http/csrf/v2/BUILD b/envoy/config/filter/http/csrf/v2/BUILD
index aaab1df1..ce0d681b 100644
--- a/envoy/config/filter/http/csrf/v2/BUILD
+++ b/envoy/config/filter/http/csrf/v2/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
         "//envoy/type/matcher:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/BUILD b/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/BUILD
index 25c228fd..4f912f7a 100644
--- a/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/BUILD
+++ b/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/http/dynamo/v2/BUILD b/envoy/config/filter/http/dynamo/v2/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/http/dynamo/v2/BUILD
+++ b/envoy/config/filter/http/dynamo/v2/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/http/ext_authz/v2/BUILD b/envoy/config/filter/http/ext_authz/v2/BUILD
index 74e703c9..5dc4abc3 100644
--- a/envoy/config/filter/http/ext_authz/v2/BUILD
+++ b/envoy/config/filter/http/ext_authz/v2/BUILD
@@ -10,6 +10,6 @@ api_proto_package(
         "//envoy/api/v2/core:pkg",
         "//envoy/type:pkg",
         "//envoy/type/matcher:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/http/fault/v2/BUILD b/envoy/config/filter/http/fault/v2/BUILD
index df4feab7..568e1dad 100644
--- a/envoy/config/filter/http/fault/v2/BUILD
+++ b/envoy/config/filter/http/fault/v2/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/api/v2/route:pkg",
         "//envoy/config/filter/fault/v2:pkg",
         "//envoy/type:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/http/grpc_http1_bridge/v2/BUILD b/envoy/config/filter/http/grpc_http1_bridge/v2/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/http/grpc_http1_bridge/v2/BUILD
+++ b/envoy/config/filter/http/grpc_http1_bridge/v2/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/BUILD b/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/BUILD
+++ b/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/http/grpc_stats/v2alpha/BUILD b/envoy/config/filter/http/grpc_stats/v2alpha/BUILD
index 83bc0ab9..10580ab4 100644
--- a/envoy/config/filter/http/grpc_stats/v2alpha/BUILD
+++ b/envoy/config/filter/http/grpc_stats/v2alpha/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/http/grpc_web/v2/BUILD b/envoy/config/filter/http/grpc_web/v2/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/http/grpc_web/v2/BUILD
+++ b/envoy/config/filter/http/grpc_web/v2/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/http/gzip/v2/BUILD b/envoy/config/filter/http/gzip/v2/BUILD
index 9cb0d129..4089809e 100644
--- a/envoy/config/filter/http/gzip/v2/BUILD
+++ b/envoy/config/filter/http/gzip/v2/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/filter/http/compressor/v2:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/http/header_to_metadata/v2/BUILD b/envoy/config/filter/http/header_to_metadata/v2/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/http/header_to_metadata/v2/BUILD
+++ b/envoy/config/filter/http/header_to_metadata/v2/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/http/health_check/v2/BUILD b/envoy/config/filter/http/health_check/v2/BUILD
index 22fc8fd4..5cc84b4a 100644
--- a/envoy/config/filter/http/health_check/v2/BUILD
+++ b/envoy/config/filter/http/health_check/v2/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/route:pkg",
         "//envoy/type:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/http/ip_tagging/v2/BUILD b/envoy/config/filter/http/ip_tagging/v2/BUILD
index 83bc0ab9..10580ab4 100644
--- a/envoy/config/filter/http/ip_tagging/v2/BUILD
+++ b/envoy/config/filter/http/ip_tagging/v2/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/http/jwt_authn/v2alpha/BUILD b/envoy/config/filter/http/jwt_authn/v2alpha/BUILD
index 1e485f4e..ef28c91b 100644
--- a/envoy/config/filter/http/jwt_authn/v2alpha/BUILD
+++ b/envoy/config/filter/http/jwt_authn/v2alpha/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
         "//envoy/api/v2/route:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/http/lua/v2/BUILD b/envoy/config/filter/http/lua/v2/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/http/lua/v2/BUILD
+++ b/envoy/config/filter/http/lua/v2/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/http/on_demand/v2/BUILD b/envoy/config/filter/http/on_demand/v2/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/http/on_demand/v2/BUILD
+++ b/envoy/config/filter/http/on_demand/v2/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/http/original_src/v2alpha1/BUILD b/envoy/config/filter/http/original_src/v2alpha1/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/http/original_src/v2alpha1/BUILD
+++ b/envoy/config/filter/http/original_src/v2alpha1/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/http/rate_limit/v2/BUILD b/envoy/config/filter/http/rate_limit/v2/BUILD
index 5b66057a..e5e3cac0 100644
--- a/envoy/config/filter/http/rate_limit/v2/BUILD
+++ b/envoy/config/filter/http/rate_limit/v2/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/ratelimit/v2:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/http/rbac/v2/BUILD b/envoy/config/filter/http/rbac/v2/BUILD
index 90082d08..a7b74db0 100644
--- a/envoy/config/filter/http/rbac/v2/BUILD
+++ b/envoy/config/filter/http/rbac/v2/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/rbac/v2:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/http/router/v2/BUILD b/envoy/config/filter/http/router/v2/BUILD
index 4b7ccc42..3e6564b8 100644
--- a/envoy/config/filter/http/router/v2/BUILD
+++ b/envoy/config/filter/http/router/v2/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/filter/accesslog/v2:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/http/squash/v2/BUILD b/envoy/config/filter/http/squash/v2/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/http/squash/v2/BUILD
+++ b/envoy/config/filter/http/squash/v2/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/http/tap/v2alpha/BUILD b/envoy/config/filter/http/tap/v2alpha/BUILD
index cf02fc6c..2e7c51a2 100644
--- a/envoy/config/filter/http/tap/v2alpha/BUILD
+++ b/envoy/config/filter/http/tap/v2alpha/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/common/tap/v2alpha:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/http/transcoder/v2/BUILD b/envoy/config/filter/http/transcoder/v2/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/http/transcoder/v2/BUILD
+++ b/envoy/config/filter/http/transcoder/v2/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/listener/http_inspector/v2/BUILD b/envoy/config/filter/listener/http_inspector/v2/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/listener/http_inspector/v2/BUILD
+++ b/envoy/config/filter/listener/http_inspector/v2/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/listener/original_dst/v2/BUILD b/envoy/config/filter/listener/original_dst/v2/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/listener/original_dst/v2/BUILD
+++ b/envoy/config/filter/listener/original_dst/v2/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/listener/original_src/v2alpha1/BUILD b/envoy/config/filter/listener/original_src/v2alpha1/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/listener/original_src/v2alpha1/BUILD
+++ b/envoy/config/filter/listener/original_src/v2alpha1/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/listener/proxy_protocol/v2/BUILD b/envoy/config/filter/listener/proxy_protocol/v2/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/listener/proxy_protocol/v2/BUILD
+++ b/envoy/config/filter/listener/proxy_protocol/v2/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/listener/tls_inspector/v2/BUILD b/envoy/config/filter/listener/tls_inspector/v2/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/listener/tls_inspector/v2/BUILD
+++ b/envoy/config/filter/listener/tls_inspector/v2/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/network/client_ssl_auth/v2/BUILD b/envoy/config/filter/network/client_ssl_auth/v2/BUILD
index 83bc0ab9..10580ab4 100644
--- a/envoy/config/filter/network/client_ssl_auth/v2/BUILD
+++ b/envoy/config/filter/network/client_ssl_auth/v2/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/network/direct_response/v2/BUILD b/envoy/config/filter/network/direct_response/v2/BUILD
index 83bc0ab9..10580ab4 100644
--- a/envoy/config/filter/network/direct_response/v2/BUILD
+++ b/envoy/config/filter/network/direct_response/v2/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD b/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD
index 5fe475a5..90d0f23b 100644
--- a/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD
+++ b/envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/api/v2/route:pkg",
         "//envoy/type:pkg",
         "//envoy/type/matcher:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/network/echo/v2/BUILD b/envoy/config/filter/network/echo/v2/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/network/echo/v2/BUILD
+++ b/envoy/config/filter/network/echo/v2/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/network/ext_authz/v2/BUILD b/envoy/config/filter/network/ext_authz/v2/BUILD
index 83bc0ab9..10580ab4 100644
--- a/envoy/config/filter/network/ext_authz/v2/BUILD
+++ b/envoy/config/filter/network/ext_authz/v2/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/network/http_connection_manager/v2/BUILD b/envoy/config/filter/network/http_connection_manager/v2/BUILD
index b03bcd43..d88a165d 100644
--- a/envoy/config/filter/network/http_connection_manager/v2/BUILD
+++ b/envoy/config/filter/network/http_connection_manager/v2/BUILD
@@ -13,6 +13,6 @@ api_proto_package(
         "//envoy/config/trace/v2:pkg",
         "//envoy/type:pkg",
         "//envoy/type/tracing/v2:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/network/kafka_broker/v2alpha1/BUILD b/envoy/config/filter/network/kafka_broker/v2alpha1/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/network/kafka_broker/v2alpha1/BUILD
+++ b/envoy/config/filter/network/kafka_broker/v2alpha1/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/network/local_rate_limit/v2alpha/BUILD b/envoy/config/filter/network/local_rate_limit/v2alpha/BUILD
index 2ffbc958..4810773b 100644
--- a/envoy/config/filter/network/local_rate_limit/v2alpha/BUILD
+++ b/envoy/config/filter/network/local_rate_limit/v2alpha/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
         "//envoy/type:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/network/mongo_proxy/v2/BUILD b/envoy/config/filter/network/mongo_proxy/v2/BUILD
index b4f275ad..d301445b 100644
--- a/envoy/config/filter/network/mongo_proxy/v2/BUILD
+++ b/envoy/config/filter/network/mongo_proxy/v2/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/filter/fault/v2:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD b/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD
+++ b/envoy/config/filter/network/mysql_proxy/v1alpha1/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/network/rate_limit/v2/BUILD b/envoy/config/filter/network/rate_limit/v2/BUILD
index 6d29e84c..1bf86ec5 100644
--- a/envoy/config/filter/network/rate_limit/v2/BUILD
+++ b/envoy/config/filter/network/rate_limit/v2/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/ratelimit:pkg",
         "//envoy/config/ratelimit/v2:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/network/rbac/v2/BUILD b/envoy/config/filter/network/rbac/v2/BUILD
index 90082d08..a7b74db0 100644
--- a/envoy/config/filter/network/rbac/v2/BUILD
+++ b/envoy/config/filter/network/rbac/v2/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/rbac/v2:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/network/redis_proxy/v2/BUILD b/envoy/config/filter/network/redis_proxy/v2/BUILD
index f9170151..d9a6fd81 100644
--- a/envoy/config/filter/network/redis_proxy/v2/BUILD
+++ b/envoy/config/filter/network/redis_proxy/v2/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/annotations:pkg",
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/network/sni_cluster/v2/BUILD b/envoy/config/filter/network/sni_cluster/v2/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/network/sni_cluster/v2/BUILD
+++ b/envoy/config/filter/network/sni_cluster/v2/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/network/tcp_proxy/v2/BUILD b/envoy/config/filter/network/tcp_proxy/v2/BUILD
index c02167a1..59e43351 100644
--- a/envoy/config/filter/network/tcp_proxy/v2/BUILD
+++ b/envoy/config/filter/network/tcp_proxy/v2/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/api/v2/core:pkg",
         "//envoy/config/filter/accesslog/v2:pkg",
         "//envoy/type:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD b/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD
index 1e485f4e..ef28c91b 100644
--- a/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD
+++ b/envoy/config/filter/network/thrift_proxy/v2alpha1/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
         "//envoy/api/v2/route:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD b/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD
+++ b/envoy/config/filter/network/zookeeper_proxy/v1alpha1/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD b/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD
index 5b66057a..e5e3cac0 100644
--- a/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD
+++ b/envoy/config/filter/thrift/rate_limit/v2alpha1/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/ratelimit/v2:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/filter/thrift/router/v2alpha1/BUILD b/envoy/config/filter/thrift/router/v2alpha1/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/thrift/router/v2alpha1/BUILD
+++ b/envoy/config/filter/thrift/router/v2alpha1/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/filter/udp/udp_proxy/v2alpha/BUILD b/envoy/config/filter/udp/udp_proxy/v2alpha/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/filter/udp/udp_proxy/v2alpha/BUILD
+++ b/envoy/config/filter/udp/udp_proxy/v2alpha/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/grpc_credential/v2alpha/BUILD b/envoy/config/grpc_credential/v2alpha/BUILD
index 83bc0ab9..10580ab4 100644
--- a/envoy/config/grpc_credential/v2alpha/BUILD
+++ b/envoy/config/grpc_credential/v2alpha/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/grpc_credential/v3/BUILD b/envoy/config/grpc_credential/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/config/grpc_credential/v3/BUILD
+++ b/envoy/config/grpc_credential/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/health_checker/redis/v2/BUILD b/envoy/config/health_checker/redis/v2/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/health_checker/redis/v2/BUILD
+++ b/envoy/config/health_checker/redis/v2/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/listener/v2/BUILD b/envoy/config/listener/v2/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/listener/v2/BUILD
+++ b/envoy/config/listener/v2/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/listener/v3/BUILD b/envoy/config/listener/v3/BUILD
index f4f900c4..712a0d83 100644
--- a/envoy/config/listener/v3/BUILD
+++ b/envoy/config/listener/v3/BUILD
@@ -10,9 +10,9 @@ api_proto_package(
         "//envoy/config/accesslog/v3:pkg",
         "//envoy/config/core/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
-        "@com_github_cncf_udpa//xds/core/v3:pkg",
-        "@com_github_cncf_udpa//xds/type/matcher/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//xds/core/v3:pkg",
+        "@com_github_cncf_xds//xds/type/matcher/v3:pkg",
     ],
 )
diff --git a/envoy/config/metrics/v2/BUILD b/envoy/config/metrics/v2/BUILD
index aaab1df1..ce0d681b 100644
--- a/envoy/config/metrics/v2/BUILD
+++ b/envoy/config/metrics/v2/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
         "//envoy/type/matcher:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/metrics/v3/BUILD b/envoy/config/metrics/v3/BUILD
index 3f3a5395..e3bfc4e1 100644
--- a/envoy/config/metrics/v3/BUILD
+++ b/envoy/config/metrics/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/overload/v2alpha/BUILD b/envoy/config/overload/v2alpha/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/overload/v2alpha/BUILD
+++ b/envoy/config/overload/v2alpha/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/overload/v3/BUILD b/envoy/config/overload/v3/BUILD
index 9a76b7e1..ef19132f 100644
--- a/envoy/config/overload/v3/BUILD
+++ b/envoy/config/overload/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/ratelimit/v2/BUILD b/envoy/config/ratelimit/v2/BUILD
index 83bc0ab9..10580ab4 100644
--- a/envoy/config/ratelimit/v2/BUILD
+++ b/envoy/config/ratelimit/v2/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/ratelimit/v3/BUILD b/envoy/config/ratelimit/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/config/ratelimit/v3/BUILD
+++ b/envoy/config/ratelimit/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/rbac/v2/BUILD b/envoy/config/rbac/v2/BUILD
index 4bce7466..58b321a9 100644
--- a/envoy/config/rbac/v2/BUILD
+++ b/envoy/config/rbac/v2/BUILD
@@ -9,7 +9,7 @@ api_proto_package(
         "//envoy/api/v2/core:pkg",
         "//envoy/api/v2/route:pkg",
         "//envoy/type/matcher:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
         "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto",
     ],
 )
diff --git a/envoy/config/rbac/v3/BUILD b/envoy/config/rbac/v3/BUILD
index c289def1..a8efea38 100644
--- a/envoy/config/rbac/v3/BUILD
+++ b/envoy/config/rbac/v3/BUILD
@@ -11,7 +11,7 @@ api_proto_package(
         "//envoy/config/route/v3:pkg",
         "//envoy/type/matcher/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
         "@com_google_googleapis//google/api/expr/v1alpha1:checked_proto",
         "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto",
     ],
diff --git a/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD b/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD
+++ b/envoy/config/resource_monitor/fixed_heap/v2alpha/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD b/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD
+++ b/envoy/config/resource_monitor/injected_resource/v2alpha/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/retry/omit_canary_hosts/v2/BUILD b/envoy/config/retry/omit_canary_hosts/v2/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/retry/omit_canary_hosts/v2/BUILD
+++ b/envoy/config/retry/omit_canary_hosts/v2/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/retry/omit_host_metadata/v2/BUILD b/envoy/config/retry/omit_host_metadata/v2/BUILD
index 83bc0ab9..10580ab4 100644
--- a/envoy/config/retry/omit_host_metadata/v2/BUILD
+++ b/envoy/config/retry/omit_host_metadata/v2/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/retry/previous_hosts/v2/BUILD b/envoy/config/retry/previous_hosts/v2/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/retry/previous_hosts/v2/BUILD
+++ b/envoy/config/retry/previous_hosts/v2/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/retry/previous_priorities/BUILD b/envoy/config/retry/previous_priorities/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/retry/previous_priorities/BUILD
+++ b/envoy/config/retry/previous_priorities/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/route/v3/BUILD b/envoy/config/route/v3/BUILD
index 385c2c8c..8c0e78d3 100644
--- a/envoy/config/route/v3/BUILD
+++ b/envoy/config/route/v3/BUILD
@@ -12,8 +12,8 @@ api_proto_package(
         "//envoy/type/metadata/v3:pkg",
         "//envoy/type/tracing/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
-        "@com_github_cncf_udpa//xds/type/matcher/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//xds/type/matcher/v3:pkg",
     ],
 )
diff --git a/envoy/config/tap/v3/BUILD b/envoy/config/tap/v3/BUILD
index a457820f..ccd4d1a0 100644
--- a/envoy/config/tap/v3/BUILD
+++ b/envoy/config/tap/v3/BUILD
@@ -10,6 +10,6 @@ api_proto_package(
         "//envoy/config/common/matcher/v3:pkg",
         "//envoy/config/core/v3:pkg",
         "//envoy/config/route/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/trace/v2/BUILD b/envoy/config/trace/v2/BUILD
index e6505e4f..a207a53c 100644
--- a/envoy/config/trace/v2/BUILD
+++ b/envoy/config/trace/v2/BUILD
@@ -8,7 +8,7 @@ api_proto_package(
     deps = [
         "//envoy/annotations:pkg",
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
         "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto",
     ],
 )
diff --git a/envoy/config/trace/v2alpha/BUILD b/envoy/config/trace/v2alpha/BUILD
index 83bc0ab9..10580ab4 100644
--- a/envoy/config/trace/v2alpha/BUILD
+++ b/envoy/config/trace/v2alpha/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/trace/v3/BUILD b/envoy/config/trace/v3/BUILD
index 94596540..4d265c47 100644
--- a/envoy/config/trace/v3/BUILD
+++ b/envoy/config/trace/v3/BUILD
@@ -8,7 +8,7 @@ api_proto_package(
     deps = [
         "//envoy/annotations:pkg",
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
         "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto",
     ],
 )
diff --git a/envoy/config/transport_socket/alts/v2alpha/BUILD b/envoy/config/transport_socket/alts/v2alpha/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/transport_socket/alts/v2alpha/BUILD
+++ b/envoy/config/transport_socket/alts/v2alpha/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/transport_socket/raw_buffer/v2/BUILD b/envoy/config/transport_socket/raw_buffer/v2/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/transport_socket/raw_buffer/v2/BUILD
+++ b/envoy/config/transport_socket/raw_buffer/v2/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/config/transport_socket/tap/v2alpha/BUILD b/envoy/config/transport_socket/tap/v2alpha/BUILD
index 52ca9859..34f67e3b 100644
--- a/envoy/config/transport_socket/tap/v2alpha/BUILD
+++ b/envoy/config/transport_socket/tap/v2alpha/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
         "//envoy/config/common/tap/v2alpha:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/config/upstream/local_address_selector/v3/BUILD b/envoy/config/upstream/local_address_selector/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/config/upstream/local_address_selector/v3/BUILD
+++ b/envoy/config/upstream/local_address_selector/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/data/accesslog/v2/BUILD b/envoy/data/accesslog/v2/BUILD
index 83bc0ab9..10580ab4 100644
--- a/envoy/data/accesslog/v2/BUILD
+++ b/envoy/data/accesslog/v2/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/data/accesslog/v3/BUILD b/envoy/data/accesslog/v3/BUILD
index a1775bbe..e74acc66 100644
--- a/envoy/data/accesslog/v3/BUILD
+++ b/envoy/data/accesslog/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/annotations:pkg",
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/data/cluster/v2alpha/BUILD b/envoy/data/cluster/v2alpha/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/data/cluster/v2alpha/BUILD
+++ b/envoy/data/cluster/v2alpha/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/data/cluster/v3/BUILD b/envoy/data/cluster/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/data/cluster/v3/BUILD
+++ b/envoy/data/cluster/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/data/core/v2alpha/BUILD b/envoy/data/core/v2alpha/BUILD
index 83bc0ab9..10580ab4 100644
--- a/envoy/data/core/v2alpha/BUILD
+++ b/envoy/data/core/v2alpha/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/data/core/v3/BUILD b/envoy/data/core/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/data/core/v3/BUILD
+++ b/envoy/data/core/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/data/dns/v2alpha/BUILD b/envoy/data/dns/v2alpha/BUILD
index e3050032..22b19315 100644
--- a/envoy/data/dns/v2alpha/BUILD
+++ b/envoy/data/dns/v2alpha/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/type/matcher:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/data/dns/v3/BUILD b/envoy/data/dns/v3/BUILD
index 516369f0..30302a7b 100644
--- a/envoy/data/dns/v3/BUILD
+++ b/envoy/data/dns/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/annotations:pkg",
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/data/tap/v2alpha/BUILD b/envoy/data/tap/v2alpha/BUILD
index 83bc0ab9..10580ab4 100644
--- a/envoy/data/tap/v2alpha/BUILD
+++ b/envoy/data/tap/v2alpha/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/data/tap/v3/BUILD b/envoy/data/tap/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/data/tap/v3/BUILD
+++ b/envoy/data/tap/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/access_loggers/file/v3/BUILD b/envoy/extensions/access_loggers/file/v3/BUILD
index a1775bbe..e74acc66 100644
--- a/envoy/extensions/access_loggers/file/v3/BUILD
+++ b/envoy/extensions/access_loggers/file/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/annotations:pkg",
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/access_loggers/filters/cel/v3/BUILD b/envoy/extensions/access_loggers/filters/cel/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/access_loggers/filters/cel/v3/BUILD
+++ b/envoy/extensions/access_loggers/filters/cel/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/access_loggers/grpc/v3/BUILD b/envoy/extensions/access_loggers/grpc/v3/BUILD
index bde8902a..ee825af0 100644
--- a/envoy/extensions/access_loggers/grpc/v3/BUILD
+++ b/envoy/extensions/access_loggers/grpc/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/type/tracing/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/access_loggers/open_telemetry/v3/BUILD b/envoy/extensions/access_loggers/open_telemetry/v3/BUILD
index 37737510..95eff698 100644
--- a/envoy/extensions/access_loggers/open_telemetry/v3/BUILD
+++ b/envoy/extensions/access_loggers/open_telemetry/v3/BUILD
@@ -7,7 +7,7 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/access_loggers/grpc/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
         "@opentelemetry_proto//:common",
     ],
 )
diff --git a/envoy/extensions/access_loggers/stream/v3/BUILD b/envoy/extensions/access_loggers/stream/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/access_loggers/stream/v3/BUILD
+++ b/envoy/extensions/access_loggers/stream/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/access_loggers/wasm/v3/BUILD b/envoy/extensions/access_loggers/wasm/v3/BUILD
index c37174bd..ed3c664a 100644
--- a/envoy/extensions/access_loggers/wasm/v3/BUILD
+++ b/envoy/extensions/access_loggers/wasm/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/wasm/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/bootstrap/internal_listener/v3/BUILD b/envoy/extensions/bootstrap/internal_listener/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/bootstrap/internal_listener/v3/BUILD
+++ b/envoy/extensions/bootstrap/internal_listener/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/clusters/aggregate/v3/BUILD b/envoy/extensions/clusters/aggregate/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/clusters/aggregate/v3/BUILD
+++ b/envoy/extensions/clusters/aggregate/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/clusters/dynamic_forward_proxy/v3/BUILD b/envoy/extensions/clusters/dynamic_forward_proxy/v3/BUILD
index 00ebd40c..ef2bec72 100644
--- a/envoy/extensions/clusters/dynamic_forward_proxy/v3/BUILD
+++ b/envoy/extensions/clusters/dynamic_forward_proxy/v3/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/config/cluster/v3:pkg",
         "//envoy/config/core/v3:pkg",
         "//envoy/extensions/common/dynamic_forward_proxy/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/clusters/redis/v3/BUILD b/envoy/extensions/clusters/redis/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/clusters/redis/v3/BUILD
+++ b/envoy/extensions/clusters/redis/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/common/async_files/v3/BUILD b/envoy/extensions/common/async_files/v3/BUILD
index ec1e778e..d49202b7 100644
--- a/envoy/extensions/common/async_files/v3/BUILD
+++ b/envoy/extensions/common/async_files/v3/BUILD
@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/envoy/extensions/common/dynamic_forward_proxy/v3/BUILD b/envoy/extensions/common/dynamic_forward_proxy/v3/BUILD
index b9cc22c7..a220c748 100644
--- a/envoy/extensions/common/dynamic_forward_proxy/v3/BUILD
+++ b/envoy/extensions/common/dynamic_forward_proxy/v3/BUILD
@@ -10,6 +10,6 @@ api_proto_package(
         "//envoy/config/cluster/v3:pkg",
         "//envoy/config/common/key_value/v3:pkg",
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/common/matching/v3/BUILD b/envoy/extensions/common/matching/v3/BUILD
index 1afd4545..2afc0bdd 100644
--- a/envoy/extensions/common/matching/v3/BUILD
+++ b/envoy/extensions/common/matching/v3/BUILD
@@ -9,7 +9,7 @@ api_proto_package(
         "//envoy/annotations:pkg",
         "//envoy/config/common/matcher/v3:pkg",
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/type/matcher/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/type/matcher/v3:pkg",
     ],
 )
diff --git a/envoy/extensions/common/ratelimit/v3/BUILD b/envoy/extensions/common/ratelimit/v3/BUILD
index 9a76b7e1..ef19132f 100644
--- a/envoy/extensions/common/ratelimit/v3/BUILD
+++ b/envoy/extensions/common/ratelimit/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/common/tap/v3/BUILD b/envoy/extensions/common/tap/v3/BUILD
index a99fa811..9e898366 100644
--- a/envoy/extensions/common/tap/v3/BUILD
+++ b/envoy/extensions/common/tap/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/tap/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/compression/brotli/compressor/v3/BUILD b/envoy/extensions/compression/brotli/compressor/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/compression/brotli/compressor/v3/BUILD
+++ b/envoy/extensions/compression/brotli/compressor/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/compression/brotli/decompressor/v3/BUILD b/envoy/extensions/compression/brotli/decompressor/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/compression/brotli/decompressor/v3/BUILD
+++ b/envoy/extensions/compression/brotli/decompressor/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/compression/gzip/compressor/v3/BUILD b/envoy/extensions/compression/gzip/compressor/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/compression/gzip/compressor/v3/BUILD
+++ b/envoy/extensions/compression/gzip/compressor/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/compression/gzip/decompressor/v3/BUILD b/envoy/extensions/compression/gzip/decompressor/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/compression/gzip/decompressor/v3/BUILD
+++ b/envoy/extensions/compression/gzip/decompressor/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/compression/zstd/compressor/v3/BUILD b/envoy/extensions/compression/zstd/compressor/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/compression/zstd/compressor/v3/BUILD
+++ b/envoy/extensions/compression/zstd/compressor/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/compression/zstd/decompressor/v3/BUILD b/envoy/extensions/compression/zstd/decompressor/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/compression/zstd/decompressor/v3/BUILD
+++ b/envoy/extensions/compression/zstd/decompressor/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/config/validators/minimum_clusters/v3/BUILD b/envoy/extensions/config/validators/minimum_clusters/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/config/validators/minimum_clusters/v3/BUILD
+++ b/envoy/extensions/config/validators/minimum_clusters/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/early_data/v3/BUILD b/envoy/extensions/early_data/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/early_data/v3/BUILD
+++ b/envoy/extensions/early_data/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/common/dependency/v3/BUILD b/envoy/extensions/filters/common/dependency/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/common/dependency/v3/BUILD
+++ b/envoy/extensions/filters/common/dependency/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/common/fault/v3/BUILD b/envoy/extensions/filters/common/fault/v3/BUILD
index 9a76b7e1..ef19132f 100644
--- a/envoy/extensions/filters/common/fault/v3/BUILD
+++ b/envoy/extensions/filters/common/fault/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/common/matcher/action/v3/BUILD b/envoy/extensions/filters/common/matcher/action/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/common/matcher/action/v3/BUILD
+++ b/envoy/extensions/filters/common/matcher/action/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/common/set_filter_state/v3/BUILD b/envoy/extensions/filters/common/set_filter_state/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/filters/common/set_filter_state/v3/BUILD
+++ b/envoy/extensions/filters/common/set_filter_state/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/adaptive_concurrency/v3/BUILD b/envoy/extensions/filters/http/adaptive_concurrency/v3/BUILD
index ad2fc9a9..eeae27ad 100644
--- a/envoy/extensions/filters/http/adaptive_concurrency/v3/BUILD
+++ b/envoy/extensions/filters/http/adaptive_concurrency/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/admission_control/v3/BUILD b/envoy/extensions/filters/http/admission_control/v3/BUILD
index ad2fc9a9..eeae27ad 100644
--- a/envoy/extensions/filters/http/admission_control/v3/BUILD
+++ b/envoy/extensions/filters/http/admission_control/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/alternate_protocols_cache/v3/BUILD b/envoy/extensions/filters/http/alternate_protocols_cache/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/filters/http/alternate_protocols_cache/v3/BUILD
+++ b/envoy/extensions/filters/http/alternate_protocols_cache/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/aws_lambda/v3/BUILD b/envoy/extensions/filters/http/aws_lambda/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/http/aws_lambda/v3/BUILD
+++ b/envoy/extensions/filters/http/aws_lambda/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/http/aws_request_signing/v3/BUILD b/envoy/extensions/filters/http/aws_request_signing/v3/BUILD
index 693f0b92..bfc48633 100644
--- a/envoy/extensions/filters/http/aws_request_signing/v3/BUILD
+++ b/envoy/extensions/filters/http/aws_request_signing/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/bandwidth_limit/v3/BUILD b/envoy/extensions/filters/http/bandwidth_limit/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/filters/http/bandwidth_limit/v3/BUILD
+++ b/envoy/extensions/filters/http/bandwidth_limit/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/basic_auth/v3/BUILD b/envoy/extensions/filters/http/basic_auth/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/filters/http/basic_auth/v3/BUILD
+++ b/envoy/extensions/filters/http/basic_auth/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/buffer/v3/BUILD b/envoy/extensions/filters/http/buffer/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/http/buffer/v3/BUILD
+++ b/envoy/extensions/filters/http/buffer/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/http/cache/v3/BUILD b/envoy/extensions/filters/http/cache/v3/BUILD
index c0ffdf28..eb0224e4 100644
--- a/envoy/extensions/filters/http/cache/v3/BUILD
+++ b/envoy/extensions/filters/http/cache/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/route/v3:pkg",
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/cdn_loop/v3/BUILD b/envoy/extensions/filters/http/cdn_loop/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/http/cdn_loop/v3/BUILD
+++ b/envoy/extensions/filters/http/cdn_loop/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/http/composite/v3/BUILD b/envoy/extensions/filters/http/composite/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/filters/http/composite/v3/BUILD
+++ b/envoy/extensions/filters/http/composite/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/compressor/v3/BUILD b/envoy/extensions/filters/http/compressor/v3/BUILD
index a1775bbe..e74acc66 100644
--- a/envoy/extensions/filters/http/compressor/v3/BUILD
+++ b/envoy/extensions/filters/http/compressor/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/annotations:pkg",
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/connect_grpc_bridge/v3/BUILD b/envoy/extensions/filters/http/connect_grpc_bridge/v3/BUILD
index ec1e778e..d49202b7 100644
--- a/envoy/extensions/filters/http/connect_grpc_bridge/v3/BUILD
+++ b/envoy/extensions/filters/http/connect_grpc_bridge/v3/BUILD
@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/cors/v3/BUILD b/envoy/extensions/filters/http/cors/v3/BUILD
index 3f3a5395..e3bfc4e1 100644
--- a/envoy/extensions/filters/http/cors/v3/BUILD
+++ b/envoy/extensions/filters/http/cors/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/csrf/v3/BUILD b/envoy/extensions/filters/http/csrf/v3/BUILD
index 3f3a5395..e3bfc4e1 100644
--- a/envoy/extensions/filters/http/csrf/v3/BUILD
+++ b/envoy/extensions/filters/http/csrf/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/custom_response/v3/BUILD b/envoy/extensions/filters/http/custom_response/v3/BUILD
index 4e7598f9..720cd87d 100644
--- a/envoy/extensions/filters/http/custom_response/v3/BUILD
+++ b/envoy/extensions/filters/http/custom_response/v3/BUILD
@@ -6,8 +6,8 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
-        "@com_github_cncf_udpa//xds/type/matcher/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//xds/type/matcher/v3:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/decompressor/v3/BUILD b/envoy/extensions/filters/http/decompressor/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/filters/http/decompressor/v3/BUILD
+++ b/envoy/extensions/filters/http/decompressor/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/dynamic_forward_proxy/v3/BUILD b/envoy/extensions/filters/http/dynamic_forward_proxy/v3/BUILD
index 05f25a2f..73e98d4d 100644
--- a/envoy/extensions/filters/http/dynamic_forward_proxy/v3/BUILD
+++ b/envoy/extensions/filters/http/dynamic_forward_proxy/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/common/dynamic_forward_proxy/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/ext_authz/v3/BUILD b/envoy/extensions/filters/http/ext_authz/v3/BUILD
index d1ae5c00..cabe849e 100644
--- a/envoy/extensions/filters/http/ext_authz/v3/BUILD
+++ b/envoy/extensions/filters/http/ext_authz/v3/BUILD
@@ -10,6 +10,6 @@ api_proto_package(
         "//envoy/config/core/v3:pkg",
         "//envoy/type/matcher/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/ext_proc/v3/BUILD b/envoy/extensions/filters/http/ext_proc/v3/BUILD
index 18cc1277..8322f99f 100644
--- a/envoy/extensions/filters/http/ext_proc/v3/BUILD
+++ b/envoy/extensions/filters/http/ext_proc/v3/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/config/common/mutation_rules/v3:pkg",
         "//envoy/config/core/v3:pkg",
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/fault/v3/BUILD b/envoy/extensions/filters/http/fault/v3/BUILD
index 53db91ca..1bbe0b04 100644
--- a/envoy/extensions/filters/http/fault/v3/BUILD
+++ b/envoy/extensions/filters/http/fault/v3/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/config/route/v3:pkg",
         "//envoy/extensions/filters/common/fault/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/file_system_buffer/v3/BUILD b/envoy/extensions/filters/http/file_system_buffer/v3/BUILD
index 26baeccd..5b108dcf 100644
--- a/envoy/extensions/filters/http/file_system_buffer/v3/BUILD
+++ b/envoy/extensions/filters/http/file_system_buffer/v3/BUILD
@@ -7,7 +7,7 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/common/async_files/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/gcp_authn/v3/BUILD b/envoy/extensions/filters/http/gcp_authn/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/filters/http/gcp_authn/v3/BUILD
+++ b/envoy/extensions/filters/http/gcp_authn/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/geoip/v3/BUILD b/envoy/extensions/filters/http/geoip/v3/BUILD
index e9b556d6..628f7132 100644
--- a/envoy/extensions/filters/http/geoip/v3/BUILD
+++ b/envoy/extensions/filters/http/geoip/v3/BUILD
@@ -7,7 +7,7 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/grpc_field_extraction/v3/BUILD b/envoy/extensions/filters/http/grpc_field_extraction/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/filters/http/grpc_field_extraction/v3/BUILD
+++ b/envoy/extensions/filters/http/grpc_field_extraction/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/grpc_http1_bridge/v3/BUILD b/envoy/extensions/filters/http/grpc_http1_bridge/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/http/grpc_http1_bridge/v3/BUILD
+++ b/envoy/extensions/filters/http/grpc_http1_bridge/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3/BUILD b/envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3/BUILD
+++ b/envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/http/grpc_json_transcoder/v3/BUILD b/envoy/extensions/filters/http/grpc_json_transcoder/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/http/grpc_json_transcoder/v3/BUILD
+++ b/envoy/extensions/filters/http/grpc_json_transcoder/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/http/grpc_stats/v3/BUILD b/envoy/extensions/filters/http/grpc_stats/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/filters/http/grpc_stats/v3/BUILD
+++ b/envoy/extensions/filters/http/grpc_stats/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/grpc_web/v3/BUILD b/envoy/extensions/filters/http/grpc_web/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/http/grpc_web/v3/BUILD
+++ b/envoy/extensions/filters/http/grpc_web/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/http/gzip/v3/BUILD b/envoy/extensions/filters/http/gzip/v3/BUILD
index bfe5d198..dbd9ebc3 100644
--- a/envoy/extensions/filters/http/gzip/v3/BUILD
+++ b/envoy/extensions/filters/http/gzip/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/filters/http/compressor/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/header_mutation/v3/BUILD b/envoy/extensions/filters/http/header_mutation/v3/BUILD
index 7af7ae04..876a007c 100644
--- a/envoy/extensions/filters/http/header_mutation/v3/BUILD
+++ b/envoy/extensions/filters/http/header_mutation/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/common/mutation_rules/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/header_to_metadata/v3/BUILD b/envoy/extensions/filters/http/header_to_metadata/v3/BUILD
index 693f0b92..bfc48633 100644
--- a/envoy/extensions/filters/http/header_to_metadata/v3/BUILD
+++ b/envoy/extensions/filters/http/header_to_metadata/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/health_check/v3/BUILD b/envoy/extensions/filters/http/health_check/v3/BUILD
index c6ef7406..c5d802c5 100644
--- a/envoy/extensions/filters/http/health_check/v3/BUILD
+++ b/envoy/extensions/filters/http/health_check/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/route/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/ip_tagging/v3/BUILD b/envoy/extensions/filters/http/ip_tagging/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/filters/http/ip_tagging/v3/BUILD
+++ b/envoy/extensions/filters/http/ip_tagging/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/json_to_metadata/v3/BUILD b/envoy/extensions/filters/http/json_to_metadata/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/http/json_to_metadata/v3/BUILD
+++ b/envoy/extensions/filters/http/json_to_metadata/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/http/jwt_authn/v3/BUILD b/envoy/extensions/filters/http/jwt_authn/v3/BUILD
index 6eb33fe8..cea648f6 100644
--- a/envoy/extensions/filters/http/jwt_authn/v3/BUILD
+++ b/envoy/extensions/filters/http/jwt_authn/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/config/route/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/kill_request/v3/BUILD b/envoy/extensions/filters/http/kill_request/v3/BUILD
index 9a76b7e1..ef19132f 100644
--- a/envoy/extensions/filters/http/kill_request/v3/BUILD
+++ b/envoy/extensions/filters/http/kill_request/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/local_ratelimit/v3/BUILD b/envoy/extensions/filters/http/local_ratelimit/v3/BUILD
index 6c58a43e..1ef2f0c9 100644
--- a/envoy/extensions/filters/http/local_ratelimit/v3/BUILD
+++ b/envoy/extensions/filters/http/local_ratelimit/v3/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/config/core/v3:pkg",
         "//envoy/extensions/common/ratelimit/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/lua/v3/BUILD b/envoy/extensions/filters/http/lua/v3/BUILD
index a1775bbe..e74acc66 100644
--- a/envoy/extensions/filters/http/lua/v3/BUILD
+++ b/envoy/extensions/filters/http/lua/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/annotations:pkg",
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/oauth2/v3/BUILD b/envoy/extensions/filters/http/oauth2/v3/BUILD
index 75d36b70..19dc4b83 100644
--- a/envoy/extensions/filters/http/oauth2/v3/BUILD
+++ b/envoy/extensions/filters/http/oauth2/v3/BUILD
@@ -10,6 +10,6 @@ api_proto_package(
         "//envoy/config/route/v3:pkg",
         "//envoy/extensions/transport_sockets/tls/v3:pkg",
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/on_demand/v3/BUILD b/envoy/extensions/filters/http/on_demand/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/filters/http/on_demand/v3/BUILD
+++ b/envoy/extensions/filters/http/on_demand/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/original_src/v3/BUILD b/envoy/extensions/filters/http/original_src/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/http/original_src/v3/BUILD
+++ b/envoy/extensions/filters/http/original_src/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/http/rate_limit_quota/v3/BUILD b/envoy/extensions/filters/http/rate_limit_quota/v3/BUILD
index 39b7d6bb..5a6a4b7e 100644
--- a/envoy/extensions/filters/http/rate_limit_quota/v3/BUILD
+++ b/envoy/extensions/filters/http/rate_limit_quota/v3/BUILD
@@ -8,8 +8,8 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
-        "@com_github_cncf_udpa//xds/type/matcher/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//xds/type/matcher/v3:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/ratelimit/v3/BUILD b/envoy/extensions/filters/http/ratelimit/v3/BUILD
index 77ed9cc6..90cebe0b 100644
--- a/envoy/extensions/filters/http/ratelimit/v3/BUILD
+++ b/envoy/extensions/filters/http/ratelimit/v3/BUILD
@@ -11,6 +11,6 @@ api_proto_package(
         "//envoy/config/route/v3:pkg",
         "//envoy/type/metadata/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/rbac/v3/BUILD b/envoy/extensions/filters/http/rbac/v3/BUILD
index 49cb2cca..f4f91ded 100644
--- a/envoy/extensions/filters/http/rbac/v3/BUILD
+++ b/envoy/extensions/filters/http/rbac/v3/BUILD
@@ -7,8 +7,8 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/rbac/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
-        "@com_github_cncf_udpa//xds/type/matcher/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//xds/type/matcher/v3:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/router/v3/BUILD b/envoy/extensions/filters/http/router/v3/BUILD
index 642554d4..76b034d4 100644
--- a/envoy/extensions/filters/http/router/v3/BUILD
+++ b/envoy/extensions/filters/http/router/v3/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/annotations:pkg",
         "//envoy/config/accesslog/v3:pkg",
         "//envoy/extensions/filters/network/http_connection_manager/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/set_filter_state/v3/BUILD b/envoy/extensions/filters/http/set_filter_state/v3/BUILD
index 0e06bfca..7d18ef13 100644
--- a/envoy/extensions/filters/http/set_filter_state/v3/BUILD
+++ b/envoy/extensions/filters/http/set_filter_state/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/filters/common/set_filter_state/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/set_metadata/v3/BUILD b/envoy/extensions/filters/http/set_metadata/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/http/set_metadata/v3/BUILD
+++ b/envoy/extensions/filters/http/set_metadata/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/http/stateful_session/v3/BUILD b/envoy/extensions/filters/http/stateful_session/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/filters/http/stateful_session/v3/BUILD
+++ b/envoy/extensions/filters/http/stateful_session/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/tap/v3/BUILD b/envoy/extensions/filters/http/tap/v3/BUILD
index 6b2b1215..31d61dcf 100644
--- a/envoy/extensions/filters/http/tap/v3/BUILD
+++ b/envoy/extensions/filters/http/tap/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/common/tap/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/http/upstream_codec/v3/BUILD b/envoy/extensions/filters/http/upstream_codec/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/http/upstream_codec/v3/BUILD
+++ b/envoy/extensions/filters/http/upstream_codec/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/http/wasm/v3/BUILD b/envoy/extensions/filters/http/wasm/v3/BUILD
index c37174bd..ed3c664a 100644
--- a/envoy/extensions/filters/http/wasm/v3/BUILD
+++ b/envoy/extensions/filters/http/wasm/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/wasm/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/listener/http_inspector/v3/BUILD b/envoy/extensions/filters/listener/http_inspector/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/listener/http_inspector/v3/BUILD
+++ b/envoy/extensions/filters/listener/http_inspector/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/listener/local_ratelimit/v3/BUILD b/envoy/extensions/filters/listener/local_ratelimit/v3/BUILD
index ad2fc9a9..eeae27ad 100644
--- a/envoy/extensions/filters/listener/local_ratelimit/v3/BUILD
+++ b/envoy/extensions/filters/listener/local_ratelimit/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/listener/original_dst/v3/BUILD b/envoy/extensions/filters/listener/original_dst/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/listener/original_dst/v3/BUILD
+++ b/envoy/extensions/filters/listener/original_dst/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/listener/original_src/v3/BUILD b/envoy/extensions/filters/listener/original_src/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/listener/original_src/v3/BUILD
+++ b/envoy/extensions/filters/listener/original_src/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/listener/proxy_protocol/v3/BUILD b/envoy/extensions/filters/listener/proxy_protocol/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/filters/listener/proxy_protocol/v3/BUILD
+++ b/envoy/extensions/filters/listener/proxy_protocol/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/listener/tls_inspector/v3/BUILD b/envoy/extensions/filters/listener/tls_inspector/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/listener/tls_inspector/v3/BUILD
+++ b/envoy/extensions/filters/listener/tls_inspector/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/network/connection_limit/v3/BUILD b/envoy/extensions/filters/network/connection_limit/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/filters/network/connection_limit/v3/BUILD
+++ b/envoy/extensions/filters/network/connection_limit/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/network/direct_response/v3/BUILD b/envoy/extensions/filters/network/direct_response/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/filters/network/direct_response/v3/BUILD
+++ b/envoy/extensions/filters/network/direct_response/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/network/dubbo_proxy/router/v3/BUILD b/envoy/extensions/filters/network/dubbo_proxy/router/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/network/dubbo_proxy/router/v3/BUILD
+++ b/envoy/extensions/filters/network/dubbo_proxy/router/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/network/dubbo_proxy/v3/BUILD b/envoy/extensions/filters/network/dubbo_proxy/v3/BUILD
index c690bfe2..824cb7cd 100644
--- a/envoy/extensions/filters/network/dubbo_proxy/v3/BUILD
+++ b/envoy/extensions/filters/network/dubbo_proxy/v3/BUILD
@@ -11,6 +11,6 @@ api_proto_package(
         "//envoy/config/route/v3:pkg",
         "//envoy/type/matcher/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/network/echo/v3/BUILD b/envoy/extensions/filters/network/echo/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/network/echo/v3/BUILD
+++ b/envoy/extensions/filters/network/echo/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/network/ext_authz/v3/BUILD b/envoy/extensions/filters/network/ext_authz/v3/BUILD
index 3f3a5395..e3bfc4e1 100644
--- a/envoy/extensions/filters/network/ext_authz/v3/BUILD
+++ b/envoy/extensions/filters/network/ext_authz/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/network/http_connection_manager/v3/BUILD b/envoy/extensions/filters/network/http_connection_manager/v3/BUILD
index b1f4b3ba..39bbb5c3 100644
--- a/envoy/extensions/filters/network/http_connection_manager/v3/BUILD
+++ b/envoy/extensions/filters/network/http_connection_manager/v3/BUILD
@@ -14,6 +14,6 @@ api_proto_package(
         "//envoy/type/http/v3:pkg",
         "//envoy/type/tracing/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/network/local_ratelimit/v3/BUILD b/envoy/extensions/filters/network/local_ratelimit/v3/BUILD
index ad2fc9a9..eeae27ad 100644
--- a/envoy/extensions/filters/network/local_ratelimit/v3/BUILD
+++ b/envoy/extensions/filters/network/local_ratelimit/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/network/mongo_proxy/v3/BUILD b/envoy/extensions/filters/network/mongo_proxy/v3/BUILD
index d399b876..01b06eb3 100644
--- a/envoy/extensions/filters/network/mongo_proxy/v3/BUILD
+++ b/envoy/extensions/filters/network/mongo_proxy/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/filters/common/fault/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/network/ratelimit/v3/BUILD b/envoy/extensions/filters/network/ratelimit/v3/BUILD
index 9276f5ab..6bc991f8 100644
--- a/envoy/extensions/filters/network/ratelimit/v3/BUILD
+++ b/envoy/extensions/filters/network/ratelimit/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/ratelimit/v3:pkg",
         "//envoy/extensions/common/ratelimit/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/network/rbac/v3/BUILD b/envoy/extensions/filters/network/rbac/v3/BUILD
index 49cb2cca..f4f91ded 100644
--- a/envoy/extensions/filters/network/rbac/v3/BUILD
+++ b/envoy/extensions/filters/network/rbac/v3/BUILD
@@ -7,8 +7,8 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/rbac/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
-        "@com_github_cncf_udpa//xds/type/matcher/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//xds/type/matcher/v3:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/network/redis_proxy/v3/BUILD b/envoy/extensions/filters/network/redis_proxy/v3/BUILD
index 3a695366..f4f1453d 100644
--- a/envoy/extensions/filters/network/redis_proxy/v3/BUILD
+++ b/envoy/extensions/filters/network/redis_proxy/v3/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/annotations:pkg",
         "//envoy/config/core/v3:pkg",
         "//envoy/extensions/common/dynamic_forward_proxy/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/network/set_filter_state/v3/BUILD b/envoy/extensions/filters/network/set_filter_state/v3/BUILD
index 0e06bfca..7d18ef13 100644
--- a/envoy/extensions/filters/network/set_filter_state/v3/BUILD
+++ b/envoy/extensions/filters/network/set_filter_state/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/filters/common/set_filter_state/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/network/sni_cluster/v3/BUILD b/envoy/extensions/filters/network/sni_cluster/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/network/sni_cluster/v3/BUILD
+++ b/envoy/extensions/filters/network/sni_cluster/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3/BUILD b/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3/BUILD
index 05f25a2f..73e98d4d 100644
--- a/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3/BUILD
+++ b/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/common/dynamic_forward_proxy/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/network/tcp_proxy/v3/BUILD b/envoy/extensions/filters/network/tcp_proxy/v3/BUILD
index 495e9c79..c9c87b73 100644
--- a/envoy/extensions/filters/network/tcp_proxy/v3/BUILD
+++ b/envoy/extensions/filters/network/tcp_proxy/v3/BUILD
@@ -10,6 +10,6 @@ api_proto_package(
         "//envoy/config/accesslog/v3:pkg",
         "//envoy/config/core/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/network/thrift_proxy/filters/header_to_metadata/v3/BUILD b/envoy/extensions/filters/network/thrift_proxy/filters/header_to_metadata/v3/BUILD
index 693f0b92..bfc48633 100644
--- a/envoy/extensions/filters/network/thrift_proxy/filters/header_to_metadata/v3/BUILD
+++ b/envoy/extensions/filters/network/thrift_proxy/filters/header_to_metadata/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/network/thrift_proxy/filters/payload_to_metadata/v3/BUILD b/envoy/extensions/filters/network/thrift_proxy/filters/payload_to_metadata/v3/BUILD
index 693f0b92..bfc48633 100644
--- a/envoy/extensions/filters/network/thrift_proxy/filters/payload_to_metadata/v3/BUILD
+++ b/envoy/extensions/filters/network/thrift_proxy/filters/payload_to_metadata/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3/BUILD b/envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3/BUILD
index 0bad1491..928d9a6b 100644
--- a/envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3/BUILD
+++ b/envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/ratelimit/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/network/thrift_proxy/router/v3/BUILD b/envoy/extensions/filters/network/thrift_proxy/router/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/network/thrift_proxy/router/v3/BUILD
+++ b/envoy/extensions/filters/network/thrift_proxy/router/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/network/thrift_proxy/v3/BUILD b/envoy/extensions/filters/network/thrift_proxy/v3/BUILD
index eee482f0..8cc8bfcc 100644
--- a/envoy/extensions/filters/network/thrift_proxy/v3/BUILD
+++ b/envoy/extensions/filters/network/thrift_proxy/v3/BUILD
@@ -10,6 +10,6 @@ api_proto_package(
         "//envoy/config/accesslog/v3:pkg",
         "//envoy/config/core/v3:pkg",
         "//envoy/config/route/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/network/wasm/v3/BUILD b/envoy/extensions/filters/network/wasm/v3/BUILD
index c37174bd..ed3c664a 100644
--- a/envoy/extensions/filters/network/wasm/v3/BUILD
+++ b/envoy/extensions/filters/network/wasm/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/wasm/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/network/zookeeper_proxy/v3/BUILD b/envoy/extensions/filters/network/zookeeper_proxy/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/network/zookeeper_proxy/v3/BUILD
+++ b/envoy/extensions/filters/network/zookeeper_proxy/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/udp/dns_filter/v3/BUILD b/envoy/extensions/filters/udp/dns_filter/v3/BUILD
index 1f8dbc5a..c95410c7 100644
--- a/envoy/extensions/filters/udp/dns_filter/v3/BUILD
+++ b/envoy/extensions/filters/udp/dns_filter/v3/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/annotations:pkg",
         "//envoy/config/core/v3:pkg",
         "//envoy/data/dns/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/udp/udp_proxy/session/dynamic_forward_proxy/v3/BUILD b/envoy/extensions/filters/udp/udp_proxy/session/dynamic_forward_proxy/v3/BUILD
index 05f25a2f..73e98d4d 100644
--- a/envoy/extensions/filters/udp/udp_proxy/session/dynamic_forward_proxy/v3/BUILD
+++ b/envoy/extensions/filters/udp/udp_proxy/session/dynamic_forward_proxy/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/common/dynamic_forward_proxy/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/filters/udp/udp_proxy/session/http_capsule/v3/BUILD b/envoy/extensions/filters/udp/udp_proxy/session/http_capsule/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/filters/udp/udp_proxy/session/http_capsule/v3/BUILD
+++ b/envoy/extensions/filters/udp/udp_proxy/session/http_capsule/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/filters/udp/udp_proxy/v3/BUILD b/envoy/extensions/filters/udp/udp_proxy/v3/BUILD
index 375c78d2..501298f8 100644
--- a/envoy/extensions/filters/udp/udp_proxy/v3/BUILD
+++ b/envoy/extensions/filters/udp/udp_proxy/v3/BUILD
@@ -9,8 +9,8 @@ api_proto_package(
         "//envoy/annotations:pkg",
         "//envoy/config/accesslog/v3:pkg",
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
-        "@com_github_cncf_udpa//xds/type/matcher/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//xds/type/matcher/v3:pkg",
     ],
 )
diff --git a/envoy/extensions/formatter/cel/v3/BUILD b/envoy/extensions/formatter/cel/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/formatter/cel/v3/BUILD
+++ b/envoy/extensions/formatter/cel/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/formatter/metadata/v3/BUILD b/envoy/extensions/formatter/metadata/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/formatter/metadata/v3/BUILD
+++ b/envoy/extensions/formatter/metadata/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/formatter/req_without_query/v3/BUILD b/envoy/extensions/formatter/req_without_query/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/formatter/req_without_query/v3/BUILD
+++ b/envoy/extensions/formatter/req_without_query/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/geoip_providers/common/v3/BUILD b/envoy/extensions/geoip_providers/common/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/geoip_providers/common/v3/BUILD
+++ b/envoy/extensions/geoip_providers/common/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/geoip_providers/maxmind/v3/BUILD b/envoy/extensions/geoip_providers/maxmind/v3/BUILD
index 082f67d1..06e26d5c 100644
--- a/envoy/extensions/geoip_providers/maxmind/v3/BUILD
+++ b/envoy/extensions/geoip_providers/maxmind/v3/BUILD
@@ -7,7 +7,7 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/geoip_providers/common/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/envoy/extensions/health_check/event_sinks/file/v3/BUILD b/envoy/extensions/health_check/event_sinks/file/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/health_check/event_sinks/file/v3/BUILD
+++ b/envoy/extensions/health_check/event_sinks/file/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/health_checkers/redis/v3/BUILD b/envoy/extensions/health_checkers/redis/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/health_checkers/redis/v3/BUILD
+++ b/envoy/extensions/health_checkers/redis/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/health_checkers/thrift/v3/BUILD b/envoy/extensions/health_checkers/thrift/v3/BUILD
index 8e325386..993cf11f 100644
--- a/envoy/extensions/health_checkers/thrift/v3/BUILD
+++ b/envoy/extensions/health_checkers/thrift/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/filters/network/thrift_proxy/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/http/cache/file_system_http_cache/v3/BUILD b/envoy/extensions/http/cache/file_system_http_cache/v3/BUILD
index 26baeccd..5b108dcf 100644
--- a/envoy/extensions/http/cache/file_system_http_cache/v3/BUILD
+++ b/envoy/extensions/http/cache/file_system_http_cache/v3/BUILD
@@ -7,7 +7,7 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/common/async_files/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/envoy/extensions/http/cache/simple_http_cache/v3/BUILD b/envoy/extensions/http/cache/simple_http_cache/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/http/cache/simple_http_cache/v3/BUILD
+++ b/envoy/extensions/http/cache/simple_http_cache/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/http/custom_response/local_response_policy/v3/BUILD b/envoy/extensions/http/custom_response/local_response_policy/v3/BUILD
index e9b556d6..628f7132 100644
--- a/envoy/extensions/http/custom_response/local_response_policy/v3/BUILD
+++ b/envoy/extensions/http/custom_response/local_response_policy/v3/BUILD
@@ -7,7 +7,7 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/envoy/extensions/http/custom_response/redirect_policy/v3/BUILD b/envoy/extensions/http/custom_response/redirect_policy/v3/BUILD
index d0a7c688..b6c098a2 100644
--- a/envoy/extensions/http/custom_response/redirect_policy/v3/BUILD
+++ b/envoy/extensions/http/custom_response/redirect_policy/v3/BUILD
@@ -8,7 +8,7 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/config/route/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/envoy/extensions/http/early_header_mutation/header_mutation/v3/BUILD b/envoy/extensions/http/early_header_mutation/header_mutation/v3/BUILD
index 7af7ae04..876a007c 100644
--- a/envoy/extensions/http/early_header_mutation/header_mutation/v3/BUILD
+++ b/envoy/extensions/http/early_header_mutation/header_mutation/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/common/mutation_rules/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/http/header_formatters/preserve_case/v3/BUILD b/envoy/extensions/http/header_formatters/preserve_case/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/http/header_formatters/preserve_case/v3/BUILD
+++ b/envoy/extensions/http/header_formatters/preserve_case/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/http/header_validators/envoy_default/v3/BUILD b/envoy/extensions/http/header_validators/envoy_default/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/http/header_validators/envoy_default/v3/BUILD
+++ b/envoy/extensions/http/header_validators/envoy_default/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/http/original_ip_detection/custom_header/v3/BUILD b/envoy/extensions/http/original_ip_detection/custom_header/v3/BUILD
index 9a76b7e1..ef19132f 100644
--- a/envoy/extensions/http/original_ip_detection/custom_header/v3/BUILD
+++ b/envoy/extensions/http/original_ip_detection/custom_header/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/http/original_ip_detection/xff/v3/BUILD b/envoy/extensions/http/original_ip_detection/xff/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/http/original_ip_detection/xff/v3/BUILD
+++ b/envoy/extensions/http/original_ip_detection/xff/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/http/stateful_session/cookie/v3/BUILD b/envoy/extensions/http/stateful_session/cookie/v3/BUILD
index 7a3fc432..b6f8d342 100644
--- a/envoy/extensions/http/stateful_session/cookie/v3/BUILD
+++ b/envoy/extensions/http/stateful_session/cookie/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/type/http/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/http/stateful_session/header/v3/BUILD b/envoy/extensions/http/stateful_session/header/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/http/stateful_session/header/v3/BUILD
+++ b/envoy/extensions/http/stateful_session/header/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/internal_redirect/allow_listed_routes/v3/BUILD b/envoy/extensions/internal_redirect/allow_listed_routes/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/internal_redirect/allow_listed_routes/v3/BUILD
+++ b/envoy/extensions/internal_redirect/allow_listed_routes/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/internal_redirect/previous_routes/v3/BUILD b/envoy/extensions/internal_redirect/previous_routes/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/internal_redirect/previous_routes/v3/BUILD
+++ b/envoy/extensions/internal_redirect/previous_routes/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/internal_redirect/safe_cross_scheme/v3/BUILD b/envoy/extensions/internal_redirect/safe_cross_scheme/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/internal_redirect/safe_cross_scheme/v3/BUILD
+++ b/envoy/extensions/internal_redirect/safe_cross_scheme/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/key_value/file_based/v3/BUILD b/envoy/extensions/key_value/file_based/v3/BUILD
index ec1e778e..d49202b7 100644
--- a/envoy/extensions/key_value/file_based/v3/BUILD
+++ b/envoy/extensions/key_value/file_based/v3/BUILD
@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/BUILD b/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/BUILD
+++ b/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/load_balancing_policies/cluster_provided/v3/BUILD b/envoy/extensions/load_balancing_policies/cluster_provided/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/load_balancing_policies/cluster_provided/v3/BUILD
+++ b/envoy/extensions/load_balancing_policies/cluster_provided/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/load_balancing_policies/common/v3/BUILD b/envoy/extensions/load_balancing_policies/common/v3/BUILD
index ad2fc9a9..eeae27ad 100644
--- a/envoy/extensions/load_balancing_policies/common/v3/BUILD
+++ b/envoy/extensions/load_balancing_policies/common/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/load_balancing_policies/least_request/v3/BUILD b/envoy/extensions/load_balancing_policies/least_request/v3/BUILD
index 366a3c32..b45c7841 100644
--- a/envoy/extensions/load_balancing_policies/least_request/v3/BUILD
+++ b/envoy/extensions/load_balancing_policies/least_request/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/extensions/load_balancing_policies/common/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/load_balancing_policies/maglev/v3/BUILD b/envoy/extensions/load_balancing_policies/maglev/v3/BUILD
index 6a0be4c9..3ff3820a 100644
--- a/envoy/extensions/load_balancing_policies/maglev/v3/BUILD
+++ b/envoy/extensions/load_balancing_policies/maglev/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/load_balancing_policies/common/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/load_balancing_policies/pick_first/v3/BUILD b/envoy/extensions/load_balancing_policies/pick_first/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/load_balancing_policies/pick_first/v3/BUILD
+++ b/envoy/extensions/load_balancing_policies/pick_first/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/load_balancing_policies/random/v3/BUILD b/envoy/extensions/load_balancing_policies/random/v3/BUILD
index 6a0be4c9..3ff3820a 100644
--- a/envoy/extensions/load_balancing_policies/random/v3/BUILD
+++ b/envoy/extensions/load_balancing_policies/random/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/load_balancing_policies/common/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/load_balancing_policies/ring_hash/v3/BUILD b/envoy/extensions/load_balancing_policies/ring_hash/v3/BUILD
index 9ec681aa..0698cc5b 100644
--- a/envoy/extensions/load_balancing_policies/ring_hash/v3/BUILD
+++ b/envoy/extensions/load_balancing_policies/ring_hash/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/annotations:pkg",
         "//envoy/extensions/load_balancing_policies/common/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/load_balancing_policies/round_robin/v3/BUILD b/envoy/extensions/load_balancing_policies/round_robin/v3/BUILD
index 6a0be4c9..3ff3820a 100644
--- a/envoy/extensions/load_balancing_policies/round_robin/v3/BUILD
+++ b/envoy/extensions/load_balancing_policies/round_robin/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/load_balancing_policies/common/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/load_balancing_policies/subset/v3/BUILD b/envoy/extensions/load_balancing_policies/subset/v3/BUILD
index b49ae907..9d41e8bd 100644
--- a/envoy/extensions/load_balancing_policies/subset/v3/BUILD
+++ b/envoy/extensions/load_balancing_policies/subset/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/cluster/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/load_balancing_policies/wrr_locality/v3/BUILD b/envoy/extensions/load_balancing_policies/wrr_locality/v3/BUILD
index b49ae907..9d41e8bd 100644
--- a/envoy/extensions/load_balancing_policies/wrr_locality/v3/BUILD
+++ b/envoy/extensions/load_balancing_policies/wrr_locality/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/cluster/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/matching/common_inputs/environment_variable/v3/BUILD b/envoy/extensions/matching/common_inputs/environment_variable/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/matching/common_inputs/environment_variable/v3/BUILD
+++ b/envoy/extensions/matching/common_inputs/environment_variable/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/matching/common_inputs/network/v3/BUILD b/envoy/extensions/matching/common_inputs/network/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/matching/common_inputs/network/v3/BUILD
+++ b/envoy/extensions/matching/common_inputs/network/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/matching/common_inputs/ssl/v3/BUILD b/envoy/extensions/matching/common_inputs/ssl/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/matching/common_inputs/ssl/v3/BUILD
+++ b/envoy/extensions/matching/common_inputs/ssl/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/matching/input_matchers/consistent_hashing/v3/BUILD b/envoy/extensions/matching/input_matchers/consistent_hashing/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/matching/input_matchers/consistent_hashing/v3/BUILD
+++ b/envoy/extensions/matching/input_matchers/consistent_hashing/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/matching/input_matchers/ip/v3/BUILD b/envoy/extensions/matching/input_matchers/ip/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/matching/input_matchers/ip/v3/BUILD
+++ b/envoy/extensions/matching/input_matchers/ip/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/matching/input_matchers/runtime_fraction/v3/BUILD b/envoy/extensions/matching/input_matchers/runtime_fraction/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/matching/input_matchers/runtime_fraction/v3/BUILD
+++ b/envoy/extensions/matching/input_matchers/runtime_fraction/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/network/dns_resolver/apple/v3/BUILD b/envoy/extensions/network/dns_resolver/apple/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/network/dns_resolver/apple/v3/BUILD
+++ b/envoy/extensions/network/dns_resolver/apple/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/network/dns_resolver/cares/v3/BUILD b/envoy/extensions/network/dns_resolver/cares/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/network/dns_resolver/cares/v3/BUILD
+++ b/envoy/extensions/network/dns_resolver/cares/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/network/dns_resolver/getaddrinfo/v3/BUILD b/envoy/extensions/network/dns_resolver/getaddrinfo/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/network/dns_resolver/getaddrinfo/v3/BUILD
+++ b/envoy/extensions/network/dns_resolver/getaddrinfo/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/network/socket_interface/v3/BUILD b/envoy/extensions/network/socket_interface/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/network/socket_interface/v3/BUILD
+++ b/envoy/extensions/network/socket_interface/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/path/match/uri_template/v3/BUILD b/envoy/extensions/path/match/uri_template/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/path/match/uri_template/v3/BUILD
+++ b/envoy/extensions/path/match/uri_template/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/path/rewrite/uri_template/v3/BUILD b/envoy/extensions/path/rewrite/uri_template/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/path/rewrite/uri_template/v3/BUILD
+++ b/envoy/extensions/path/rewrite/uri_template/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/quic/connection_id_generator/v3/BUILD b/envoy/extensions/quic/connection_id_generator/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/quic/connection_id_generator/v3/BUILD
+++ b/envoy/extensions/quic/connection_id_generator/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/quic/crypto_stream/v3/BUILD b/envoy/extensions/quic/crypto_stream/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/quic/crypto_stream/v3/BUILD
+++ b/envoy/extensions/quic/crypto_stream/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/quic/proof_source/v3/BUILD b/envoy/extensions/quic/proof_source/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/quic/proof_source/v3/BUILD
+++ b/envoy/extensions/quic/proof_source/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/quic/server_preferred_address/v3/BUILD b/envoy/extensions/quic/server_preferred_address/v3/BUILD
index ec1e778e..d49202b7 100644
--- a/envoy/extensions/quic/server_preferred_address/v3/BUILD
+++ b/envoy/extensions/quic/server_preferred_address/v3/BUILD
@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/envoy/extensions/rate_limit_descriptors/expr/v3/BUILD b/envoy/extensions/rate_limit_descriptors/expr/v3/BUILD
index facd82ce..81b55729 100644
--- a/envoy/extensions/rate_limit_descriptors/expr/v3/BUILD
+++ b/envoy/extensions/rate_limit_descriptors/expr/v3/BUILD
@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
         "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto",
     ],
 )
diff --git a/envoy/extensions/rbac/audit_loggers/stream/v3/BUILD b/envoy/extensions/rbac/audit_loggers/stream/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/rbac/audit_loggers/stream/v3/BUILD
+++ b/envoy/extensions/rbac/audit_loggers/stream/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/rbac/matchers/upstream_ip_port/v3/BUILD b/envoy/extensions/rbac/matchers/upstream_ip_port/v3/BUILD
index ad2fc9a9..eeae27ad 100644
--- a/envoy/extensions/rbac/matchers/upstream_ip_port/v3/BUILD
+++ b/envoy/extensions/rbac/matchers/upstream_ip_port/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/regex_engines/v3/BUILD b/envoy/extensions/regex_engines/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/regex_engines/v3/BUILD
+++ b/envoy/extensions/regex_engines/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/request_id/uuid/v3/BUILD b/envoy/extensions/request_id/uuid/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/request_id/uuid/v3/BUILD
+++ b/envoy/extensions/request_id/uuid/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/resource_monitors/downstream_connections/v3/BUILD b/envoy/extensions/resource_monitors/downstream_connections/v3/BUILD
index ec1e778e..d49202b7 100644
--- a/envoy/extensions/resource_monitors/downstream_connections/v3/BUILD
+++ b/envoy/extensions/resource_monitors/downstream_connections/v3/BUILD
@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD b/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD
+++ b/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/resource_monitors/injected_resource/v3/BUILD b/envoy/extensions/resource_monitors/injected_resource/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/resource_monitors/injected_resource/v3/BUILD
+++ b/envoy/extensions/resource_monitors/injected_resource/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/retry/host/omit_canary_hosts/v3/BUILD b/envoy/extensions/retry/host/omit_canary_hosts/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/retry/host/omit_canary_hosts/v3/BUILD
+++ b/envoy/extensions/retry/host/omit_canary_hosts/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/retry/host/omit_host_metadata/v3/BUILD b/envoy/extensions/retry/host/omit_host_metadata/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/retry/host/omit_host_metadata/v3/BUILD
+++ b/envoy/extensions/retry/host/omit_host_metadata/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/retry/host/previous_hosts/v3/BUILD b/envoy/extensions/retry/host/previous_hosts/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/retry/host/previous_hosts/v3/BUILD
+++ b/envoy/extensions/retry/host/previous_hosts/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/retry/priority/previous_priorities/v3/BUILD b/envoy/extensions/retry/priority/previous_priorities/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/retry/priority/previous_priorities/v3/BUILD
+++ b/envoy/extensions/retry/priority/previous_priorities/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/stat_sinks/graphite_statsd/v3/BUILD b/envoy/extensions/stat_sinks/graphite_statsd/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/stat_sinks/graphite_statsd/v3/BUILD
+++ b/envoy/extensions/stat_sinks/graphite_statsd/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/stat_sinks/open_telemetry/v3/BUILD b/envoy/extensions/stat_sinks/open_telemetry/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/stat_sinks/open_telemetry/v3/BUILD
+++ b/envoy/extensions/stat_sinks/open_telemetry/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/stat_sinks/wasm/v3/BUILD b/envoy/extensions/stat_sinks/wasm/v3/BUILD
index c37174bd..ed3c664a 100644
--- a/envoy/extensions/stat_sinks/wasm/v3/BUILD
+++ b/envoy/extensions/stat_sinks/wasm/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/wasm/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/tracers/opentelemetry/resource_detectors/v3/BUILD b/envoy/extensions/tracers/opentelemetry/resource_detectors/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/tracers/opentelemetry/resource_detectors/v3/BUILD
+++ b/envoy/extensions/tracers/opentelemetry/resource_detectors/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/tracers/opentelemetry/samplers/v3/BUILD b/envoy/extensions/tracers/opentelemetry/samplers/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/tracers/opentelemetry/samplers/v3/BUILD
+++ b/envoy/extensions/tracers/opentelemetry/samplers/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/transport_sockets/alts/v3/BUILD b/envoy/extensions/transport_sockets/alts/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/transport_sockets/alts/v3/BUILD
+++ b/envoy/extensions/transport_sockets/alts/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/transport_sockets/http_11_proxy/v3/BUILD b/envoy/extensions/transport_sockets/http_11_proxy/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/transport_sockets/http_11_proxy/v3/BUILD
+++ b/envoy/extensions/transport_sockets/http_11_proxy/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/transport_sockets/internal_upstream/v3/BUILD b/envoy/extensions/transport_sockets/internal_upstream/v3/BUILD
index 1bbba241..450e5434 100644
--- a/envoy/extensions/transport_sockets/internal_upstream/v3/BUILD
+++ b/envoy/extensions/transport_sockets/internal_upstream/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/type/metadata/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/transport_sockets/proxy_protocol/v3/BUILD b/envoy/extensions/transport_sockets/proxy_protocol/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/transport_sockets/proxy_protocol/v3/BUILD
+++ b/envoy/extensions/transport_sockets/proxy_protocol/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/transport_sockets/quic/v3/BUILD b/envoy/extensions/transport_sockets/quic/v3/BUILD
index 3ca8242f..63fb3642 100644
--- a/envoy/extensions/transport_sockets/quic/v3/BUILD
+++ b/envoy/extensions/transport_sockets/quic/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/transport_sockets/tls/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/transport_sockets/raw_buffer/v3/BUILD b/envoy/extensions/transport_sockets/raw_buffer/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/transport_sockets/raw_buffer/v3/BUILD
+++ b/envoy/extensions/transport_sockets/raw_buffer/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/transport_sockets/s2a/v3/BUILD b/envoy/extensions/transport_sockets/s2a/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/transport_sockets/s2a/v3/BUILD
+++ b/envoy/extensions/transport_sockets/s2a/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/transport_sockets/starttls/v3/BUILD b/envoy/extensions/transport_sockets/starttls/v3/BUILD
index 7ae3c01a..2addd072 100644
--- a/envoy/extensions/transport_sockets/starttls/v3/BUILD
+++ b/envoy/extensions/transport_sockets/starttls/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/extensions/transport_sockets/raw_buffer/v3:pkg",
         "//envoy/extensions/transport_sockets/tls/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/transport_sockets/tap/v3/BUILD b/envoy/extensions/transport_sockets/tap/v3/BUILD
index b97db3d6..6f8c1c8f 100644
--- a/envoy/extensions/transport_sockets/tap/v3/BUILD
+++ b/envoy/extensions/transport_sockets/tap/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/extensions/common/tap/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/transport_sockets/tcp_stats/v3/BUILD b/envoy/extensions/transport_sockets/tcp_stats/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/transport_sockets/tcp_stats/v3/BUILD
+++ b/envoy/extensions/transport_sockets/tcp_stats/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/transport_sockets/tls/v3/BUILD b/envoy/extensions/transport_sockets/tls/v3/BUILD
index 75026a89..8a81977d 100644
--- a/envoy/extensions/transport_sockets/tls/v3/BUILD
+++ b/envoy/extensions/transport_sockets/tls/v3/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/annotations:pkg",
         "//envoy/config/core/v3:pkg",
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/udp_packet_writer/v3/BUILD b/envoy/extensions/udp_packet_writer/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/udp_packet_writer/v3/BUILD
+++ b/envoy/extensions/udp_packet_writer/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/upstreams/http/generic/v3/BUILD b/envoy/extensions/upstreams/http/generic/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/upstreams/http/generic/v3/BUILD
+++ b/envoy/extensions/upstreams/http/generic/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/upstreams/http/http/v3/BUILD b/envoy/extensions/upstreams/http/http/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/upstreams/http/http/v3/BUILD
+++ b/envoy/extensions/upstreams/http/http/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/upstreams/http/tcp/v3/BUILD b/envoy/extensions/upstreams/http/tcp/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/upstreams/http/tcp/v3/BUILD
+++ b/envoy/extensions/upstreams/http/tcp/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/upstreams/http/udp/v3/BUILD b/envoy/extensions/upstreams/http/udp/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/upstreams/http/udp/v3/BUILD
+++ b/envoy/extensions/upstreams/http/udp/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/upstreams/http/v3/BUILD b/envoy/extensions/upstreams/http/v3/BUILD
index a3fe9fa9..e6a0401f 100644
--- a/envoy/extensions/upstreams/http/v3/BUILD
+++ b/envoy/extensions/upstreams/http/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/extensions/filters/network/http_connection_manager/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/upstreams/tcp/generic/v3/BUILD b/envoy/extensions/upstreams/tcp/generic/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/upstreams/tcp/generic/v3/BUILD
+++ b/envoy/extensions/upstreams/tcp/generic/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/upstreams/tcp/v3/BUILD b/envoy/extensions/upstreams/tcp/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/upstreams/tcp/v3/BUILD
+++ b/envoy/extensions/upstreams/tcp/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/extensions/wasm/v3/BUILD b/envoy/extensions/wasm/v3/BUILD
index 1c1a6f6b..09a37ad1 100644
--- a/envoy/extensions/wasm/v3/BUILD
+++ b/envoy/extensions/wasm/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/extensions/watchdog/profile_action/v3/BUILD b/envoy/extensions/watchdog/profile_action/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/extensions/watchdog/profile_action/v3/BUILD
+++ b/envoy/extensions/watchdog/profile_action/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/service/accesslog/v2/BUILD b/envoy/service/accesslog/v2/BUILD
index 1253698c..e05de726 100644
--- a/envoy/service/accesslog/v2/BUILD
+++ b/envoy/service/accesslog/v2/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
         "//envoy/data/accesslog/v2:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/accesslog/v3/BUILD b/envoy/service/accesslog/v3/BUILD
index c913d31f..10edf724 100644
--- a/envoy/service/accesslog/v3/BUILD
+++ b/envoy/service/accesslog/v3/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/data/accesslog/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/auth/v2/BUILD b/envoy/service/auth/v2/BUILD
index fa00ca51..0fc0d204 100644
--- a/envoy/service/auth/v2/BUILD
+++ b/envoy/service/auth/v2/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
         "//envoy/type:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/auth/v3/BUILD b/envoy/service/auth/v3/BUILD
index f39e4f85..4f64fe2f 100644
--- a/envoy/service/auth/v3/BUILD
+++ b/envoy/service/auth/v3/BUILD
@@ -10,6 +10,6 @@ api_proto_package(
         "//envoy/annotations:pkg",
         "//envoy/config/core/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/cluster/v3/BUILD b/envoy/service/cluster/v3/BUILD
index 9f2ae1e7..b0154480 100644
--- a/envoy/service/cluster/v3/BUILD
+++ b/envoy/service/cluster/v3/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
     deps = [
         "//envoy/annotations:pkg",
         "//envoy/service/discovery/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/discovery/v2/BUILD b/envoy/service/discovery/v2/BUILD
index ec687f75..dc79641f 100644
--- a/envoy/service/discovery/v2/BUILD
+++ b/envoy/service/discovery/v2/BUILD
@@ -11,6 +11,6 @@ api_proto_package(
         "//envoy/api/v2:pkg",
         "//envoy/api/v2/core:pkg",
         "//envoy/api/v2/endpoint:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/discovery/v3/BUILD b/envoy/service/discovery/v3/BUILD
index 7753cfeb..79668d20 100644
--- a/envoy/service/discovery/v3/BUILD
+++ b/envoy/service/discovery/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     has_services = True,
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/endpoint/v3/BUILD b/envoy/service/endpoint/v3/BUILD
index 9f2ae1e7..b0154480 100644
--- a/envoy/service/endpoint/v3/BUILD
+++ b/envoy/service/endpoint/v3/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
     deps = [
         "//envoy/annotations:pkg",
         "//envoy/service/discovery/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/event_reporting/v2alpha/BUILD b/envoy/service/event_reporting/v2alpha/BUILD
index 4f58bd46..9b30e884 100644
--- a/envoy/service/event_reporting/v2alpha/BUILD
+++ b/envoy/service/event_reporting/v2alpha/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     has_services = True,
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/event_reporting/v3/BUILD b/envoy/service/event_reporting/v3/BUILD
index 7753cfeb..79668d20 100644
--- a/envoy/service/event_reporting/v3/BUILD
+++ b/envoy/service/event_reporting/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     has_services = True,
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/ext_proc/v3/BUILD b/envoy/service/ext_proc/v3/BUILD
index 62a33c34..0e337d5c 100644
--- a/envoy/service/ext_proc/v3/BUILD
+++ b/envoy/service/ext_proc/v3/BUILD
@@ -10,6 +10,6 @@ api_proto_package(
         "//envoy/config/core/v3:pkg",
         "//envoy/extensions/filters/http/ext_proc/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/extension/v3/BUILD b/envoy/service/extension/v3/BUILD
index 9f2ae1e7..b0154480 100644
--- a/envoy/service/extension/v3/BUILD
+++ b/envoy/service/extension/v3/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
     deps = [
         "//envoy/annotations:pkg",
         "//envoy/service/discovery/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/health/v3/BUILD b/envoy/service/health/v3/BUILD
index b2838399..786d0d75 100644
--- a/envoy/service/health/v3/BUILD
+++ b/envoy/service/health/v3/BUILD
@@ -11,6 +11,6 @@ api_proto_package(
         "//envoy/config/cluster/v3:pkg",
         "//envoy/config/core/v3:pkg",
         "//envoy/config/endpoint/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/listener/v3/BUILD b/envoy/service/listener/v3/BUILD
index 9f2ae1e7..b0154480 100644
--- a/envoy/service/listener/v3/BUILD
+++ b/envoy/service/listener/v3/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
     deps = [
         "//envoy/annotations:pkg",
         "//envoy/service/discovery/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/load_stats/v2/BUILD b/envoy/service/load_stats/v2/BUILD
index 12632515..55f6785d 100644
--- a/envoy/service/load_stats/v2/BUILD
+++ b/envoy/service/load_stats/v2/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
         "//envoy/api/v2/endpoint:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/load_stats/v3/BUILD b/envoy/service/load_stats/v3/BUILD
index 1ee733dc..f3dcebe1 100644
--- a/envoy/service/load_stats/v3/BUILD
+++ b/envoy/service/load_stats/v3/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/config/endpoint/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/metrics/v2/BUILD b/envoy/service/metrics/v2/BUILD
index 79fc6928..434723c8 100644
--- a/envoy/service/metrics/v2/BUILD
+++ b/envoy/service/metrics/v2/BUILD
@@ -8,7 +8,7 @@ api_proto_package(
     has_services = True,
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
         "@prometheus_metrics_model//:client_model",
     ],
 )
diff --git a/envoy/service/metrics/v3/BUILD b/envoy/service/metrics/v3/BUILD
index b9a1679e..ac56c2ba 100644
--- a/envoy/service/metrics/v3/BUILD
+++ b/envoy/service/metrics/v3/BUILD
@@ -8,7 +8,7 @@ api_proto_package(
     has_services = True,
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
         "@prometheus_metrics_model//:client_model",
     ],
 )
diff --git a/envoy/service/rate_limit_quota/v3/BUILD b/envoy/service/rate_limit_quota/v3/BUILD
index 1ed447c6..8e136468 100644
--- a/envoy/service/rate_limit_quota/v3/BUILD
+++ b/envoy/service/rate_limit_quota/v3/BUILD
@@ -8,7 +8,7 @@ api_proto_package(
     has_services = True,
     deps = [
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/envoy/service/ratelimit/v2/BUILD b/envoy/service/ratelimit/v2/BUILD
index eedc3e62..ff6dcdd6 100644
--- a/envoy/service/ratelimit/v2/BUILD
+++ b/envoy/service/ratelimit/v2/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
         "//envoy/api/v2/ratelimit:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/ratelimit/v3/BUILD b/envoy/service/ratelimit/v3/BUILD
index 1cec1e02..1e1a8863 100644
--- a/envoy/service/ratelimit/v3/BUILD
+++ b/envoy/service/ratelimit/v3/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/extensions/common/ratelimit/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/route/v3/BUILD b/envoy/service/route/v3/BUILD
index 9f2ae1e7..b0154480 100644
--- a/envoy/service/route/v3/BUILD
+++ b/envoy/service/route/v3/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
     deps = [
         "//envoy/annotations:pkg",
         "//envoy/service/discovery/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/runtime/v3/BUILD b/envoy/service/runtime/v3/BUILD
index 9f2ae1e7..b0154480 100644
--- a/envoy/service/runtime/v3/BUILD
+++ b/envoy/service/runtime/v3/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
     deps = [
         "//envoy/annotations:pkg",
         "//envoy/service/discovery/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/secret/v3/BUILD b/envoy/service/secret/v3/BUILD
index 9f2ae1e7..b0154480 100644
--- a/envoy/service/secret/v3/BUILD
+++ b/envoy/service/secret/v3/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
     deps = [
         "//envoy/annotations:pkg",
         "//envoy/service/discovery/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/status/v2/BUILD b/envoy/service/status/v2/BUILD
index 39c38eb1..87bca303 100644
--- a/envoy/service/status/v2/BUILD
+++ b/envoy/service/status/v2/BUILD
@@ -10,6 +10,6 @@ api_proto_package(
         "//envoy/admin/v2alpha:pkg",
         "//envoy/api/v2/core:pkg",
         "//envoy/type/matcher:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/status/v3/BUILD b/envoy/service/status/v3/BUILD
index 45ec162b..f3b9672c 100644
--- a/envoy/service/status/v3/BUILD
+++ b/envoy/service/status/v3/BUILD
@@ -11,6 +11,6 @@ api_proto_package(
         "//envoy/annotations:pkg",
         "//envoy/config/core/v3:pkg",
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/tap/v2alpha/BUILD b/envoy/service/tap/v2alpha/BUILD
index 8e0561a1..478272b8 100644
--- a/envoy/service/tap/v2alpha/BUILD
+++ b/envoy/service/tap/v2alpha/BUILD
@@ -10,6 +10,6 @@ api_proto_package(
         "//envoy/api/v2/core:pkg",
         "//envoy/api/v2/route:pkg",
         "//envoy/data/tap/v2alpha:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/tap/v3/BUILD b/envoy/service/tap/v3/BUILD
index 8948f580..13564a42 100644
--- a/envoy/service/tap/v3/BUILD
+++ b/envoy/service/tap/v3/BUILD
@@ -9,6 +9,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/data/tap/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/service/trace/v2/BUILD b/envoy/service/trace/v2/BUILD
index 7e6d2b11..f3ef22c3 100644
--- a/envoy/service/trace/v2/BUILD
+++ b/envoy/service/trace/v2/BUILD
@@ -8,7 +8,7 @@ api_proto_package(
     has_services = True,
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
         "@opencensus_proto//opencensus/proto/trace/v1:trace_proto",
     ],
 )
diff --git a/envoy/service/trace/v3/BUILD b/envoy/service/trace/v3/BUILD
index a00d454f..1e793010 100644
--- a/envoy/service/trace/v3/BUILD
+++ b/envoy/service/trace/v3/BUILD
@@ -8,7 +8,7 @@ api_proto_package(
     has_services = True,
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
         "@opencensus_proto//opencensus/proto/trace/v1:trace_proto",
     ],
 )
diff --git a/envoy/type/BUILD b/envoy/type/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/type/BUILD
+++ b/envoy/type/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/type/http/v3/BUILD b/envoy/type/http/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/type/http/v3/BUILD
+++ b/envoy/type/http/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/type/matcher/BUILD b/envoy/type/matcher/BUILD
index 29613b4c..ad7d3cba 100644
--- a/envoy/type/matcher/BUILD
+++ b/envoy/type/matcher/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/annotations:pkg",
         "//envoy/type:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/type/matcher/v3/BUILD b/envoy/type/matcher/v3/BUILD
index fb28aa0e..320b988b 100644
--- a/envoy/type/matcher/v3/BUILD
+++ b/envoy/type/matcher/v3/BUILD
@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/annotations:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/type/metadata/v2/BUILD b/envoy/type/metadata/v2/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/type/metadata/v2/BUILD
+++ b/envoy/type/metadata/v2/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/type/metadata/v3/BUILD b/envoy/type/metadata/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/type/metadata/v3/BUILD
+++ b/envoy/type/metadata/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/envoy/type/tracing/v2/BUILD b/envoy/type/tracing/v2/BUILD
index aa64935f..e0ccd69d 100644
--- a/envoy/type/tracing/v2/BUILD
+++ b/envoy/type/tracing/v2/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/type/metadata/v2:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/type/tracing/v3/BUILD b/envoy/type/tracing/v3/BUILD
index c797ae66..369c3541 100644
--- a/envoy/type/tracing/v3/BUILD
+++ b/envoy/type/tracing/v3/BUILD
@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/type/metadata/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
diff --git a/envoy/type/v3/BUILD b/envoy/type/v3/BUILD
index ec1e778e..d49202b7 100644
--- a/envoy/type/v3/BUILD
+++ b/envoy/type/v3/BUILD
@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )
diff --git a/envoy/watchdog/v3/BUILD b/envoy/watchdog/v3/BUILD
index ee92fb65..29ebf074 100644
--- a/envoy/watchdog/v3/BUILD
+++ b/envoy/watchdog/v3/BUILD
@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )
diff --git a/test/build/BUILD b/test/build/BUILD
index 16956e8d..612cf867 100644
--- a/test/build/BUILD
+++ b/test/build/BUILD
@@ -13,7 +13,7 @@ api_cc_test(
         "//envoy/service/discovery/v2:pkg_cc_proto",
         "//envoy/service/metrics/v2:pkg_cc_proto",
         "//envoy/service/ratelimit/v2:pkg_cc_proto",
-        "@com_github_cncf_udpa//udpa/service/orca/v1:pkg_cc_proto",
+        "@com_github_cncf_xds//udpa/service/orca/v1:pkg_cc_proto",
     ],
 )