diff --git a/bazel/api_build_system.bzl b/bazel/api_build_system.bzl
index c0269d16..8a0e0bf7 100644
--- a/bazel/api_build_system.bzl
+++ b/bazel/api_build_system.bzl
@@ -186,14 +186,14 @@ def api_proto_package(
         proto = name,
         visibility = ["//visibility:public"],
         deps = depset([_go_proto_mapping(dep) for dep in deps] + [
-            "@com_github_golang_protobuf//ptypes:go_default_library",
-            "@com_github_golang_protobuf//ptypes/any:go_default_library",
-            "@com_github_golang_protobuf//ptypes/duration:go_default_library",
-            "@com_github_golang_protobuf//ptypes/struct:go_default_library",
-            "@com_github_golang_protobuf//ptypes/timestamp:go_default_library",
-            "@com_github_golang_protobuf//ptypes/wrappers:go_default_library",
             "@com_envoyproxy_protoc_gen_validate//validate:go_default_library",
-            "@com_google_googleapis//google/api:annotations_go_proto",
-            "@com_google_googleapis//google/rpc:status_go_proto",
+            "@com_github_golang_protobuf//ptypes:go_default_library_gen",
+            "@go_googleapis//google/api:annotations_go_proto",
+            "@go_googleapis//google/rpc:status_go_proto",
+            "@io_bazel_rules_go//proto/wkt:any_go_proto",
+            "@io_bazel_rules_go//proto/wkt:duration_go_proto",
+            "@io_bazel_rules_go//proto/wkt:struct_go_proto",
+            "@io_bazel_rules_go//proto/wkt:timestamp_go_proto",
+            "@io_bazel_rules_go//proto/wkt:wrappers_go_proto",
         ]).to_list(),
     )
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
index f0173e58..68ea3e2f 100644
--- a/bazel/repository_locations.bzl
+++ b/bazel/repository_locations.bzl
@@ -14,23 +14,30 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "protoc-gen-validate (PGV)",
         project_desc = "protoc plugin to generate polyglot message validators",
         project_url = "https://github.com/envoyproxy/protoc-gen-validate",
-        version = "278964a8052f96a2f514add0298098f63fb7f47f",
-        sha256 = "e368733c9fb7f8489591ffaf269170d7658cc0cd1ee322b601512b769446d3c8",
+        version = "1bcea29601b5624234a19b3d7f0ebd9e9984f583",
+        sha256 = "2062bbe50eddf3c98490339721fb02b5b5cd78f610f163b98bbf95ba7105553f",
         strip_prefix = "protoc-gen-validate-{version}",
         urls = ["https://github.com/envoyproxy/protoc-gen-validate/archive/{version}.tar.gz"],
-        release_date = "2020-06-08",
+        release_date = "2020-11-30",
         use_category = ["api"],
+        implied_untracked_deps = [
+            "com_github_iancoleman_strcase",
+            "com_github_lyft_protoc_gen_star",
+            "com_github_spf13_afero",
+            "org_golang_google_genproto",
+            "org_golang_x_text",
+        ],
     ),
     com_github_cncf_udpa = dict(
         project_name = "xDS API",
         project_desc = "xDS API Working Group (xDS-WG)",
         project_url = "https://github.com/cncf/udpa",
         # During the UDPA -> xDS migration, we aren't working with releases.
-        version = "5459f2c994033b0afed7e4a70ac7e90c90c1ffee",
-        sha256 = "c1f5c2438cf725b5f66aa4210dbc4bb691020c5ed4f64d2bc6638b06a11482f1",
+        version = "cc1b757b3eddccaaaf0743cbb107742bb7e3ee4f",
+        sha256 = "822a007cf155855d0c08a2e753a39e222e5816b904436196244066a818a8a230",
         strip_prefix = "udpa-{version}",
         urls = ["https://github.com/cncf/udpa/archive/{version}.tar.gz"],
-        release_date = "2020-11-20",
+        release_date = "2020-12-11",
         use_category = ["api"],
     ),
     com_github_openzipkin_zipkinapi = dict(
diff --git a/test/build/BUILD b/test/build/BUILD
index 2dae9fa0..affcc040 100644
--- a/test/build/BUILD
+++ b/test/build/BUILD
@@ -23,11 +23,9 @@ api_go_test(
     deps = [
         "//envoy/api/v2:pkg_go_proto",
         "//envoy/api/v2/auth:pkg_go_proto",
-        "//envoy/config/bootstrap/v2:pkg_go_proto",
         "//envoy/service/accesslog/v2:pkg_go_proto",
         "//envoy/service/discovery/v2:pkg_go_proto",
         "//envoy/service/metrics/v2:pkg_go_proto",
         "//envoy/service/ratelimit/v2:pkg_go_proto",
-        "//envoy/service/trace/v2:pkg_go_proto",
     ],
 )
diff --git a/test/build/go_build_test.go b/test/build/go_build_test.go
index 638ef478..e350404b 100644
--- a/test/build/go_build_test.go
+++ b/test/build/go_build_test.go
@@ -5,12 +5,10 @@ import (
 
 	_ "github.com/envoyproxy/go-control-plane/envoy/api/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth"
-	_ "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/accesslog/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/metrics/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/ratelimit/v2"
-	_ "github.com/envoyproxy/go-control-plane/envoy/service/trace/v2"
 )
 
 func TestNoop(t *testing.T) {