diff --git a/BUILD b/BUILD
index 2242b26f..24e0ea0d 100644
--- a/BUILD
+++ b/BUILD
@@ -18,8 +18,6 @@ proto_library(
         "//envoy/api/v2/ratelimit:pkg",
         "//envoy/api/v2/route:pkg",
         "//envoy/config/bootstrap/v2:pkg",
-        "//envoy/config/cluster/dynamic_forward_proxy/v2alpha:pkg",
-        "//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg",
         "//envoy/config/filter/accesslog/v2:pkg",
         "//envoy/config/filter/fault/v2:pkg",
         "//envoy/config/filter/network/http_connection_manager/v2:pkg",
diff --git a/envoy/extensions/clusters/dynamic_forward_proxy/v3/BUILD b/envoy/extensions/clusters/dynamic_forward_proxy/v3/BUILD
index d53049c3..05f25a2f 100644
--- a/envoy/extensions/clusters/dynamic_forward_proxy/v3/BUILD
+++ b/envoy/extensions/clusters/dynamic_forward_proxy/v3/BUILD
@@ -6,7 +6,6 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "//envoy/config/cluster/dynamic_forward_proxy/v2alpha:pkg",
         "//envoy/extensions/common/dynamic_forward_proxy/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
     ],
diff --git a/envoy/extensions/common/dynamic_forward_proxy/v3/BUILD b/envoy/extensions/common/dynamic_forward_proxy/v3/BUILD
index fb5436a6..2e981c04 100644
--- a/envoy/extensions/common/dynamic_forward_proxy/v3/BUILD
+++ b/envoy/extensions/common/dynamic_forward_proxy/v3/BUILD
@@ -8,7 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/annotations:pkg",
         "//envoy/config/cluster/v3:pkg",
-        "//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg",
         "//envoy/config/core/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
     ],
diff --git a/test/validate/BUILD b/test/validate/BUILD
index be7374cf..049780c2 100644
--- a/test/validate/BUILD
+++ b/test/validate/BUILD
@@ -6,12 +6,10 @@ api_cc_test(
     name = "pgv_test",
     srcs = ["pgv_test.cc"],
     deps = [
-        "@envoy_api//envoy/api/v2:pkg_cc_proto",
-        "@envoy_api//envoy/api/v2/core:pkg_cc_proto",
-        "@envoy_api//envoy/api/v2/listener:pkg_cc_proto",
-        "@envoy_api//envoy/api/v2/route:pkg_cc_proto",
-        "@envoy_api//envoy/config/bootstrap/v2:pkg_cc_proto",
-        "@envoy_api//envoy/config/filter/accesslog/v2:pkg_cc_proto",
+        "@envoy_api//envoy/config/accesslog/v3:pkg_cc_proto",
+        "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto",
+        "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
+        "@envoy_api//envoy/config/listener/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/compression/gzip/decompressor/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/filters/http/buffer/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/filters/http/fault/v3:pkg_cc_proto",
@@ -28,5 +26,6 @@ api_cc_test(
         "@envoy_api//envoy/extensions/filters/network/redis_proxy/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/filters/network/tcp_proxy/v3:pkg_cc_proto",
         "@envoy_api//envoy/extensions/health_checkers/redis/v3:pkg_cc_proto",
+        "@envoy_api//envoy/service/listener/v3:pkg_cc_proto",
     ],
 )
diff --git a/test/validate/pgv_test.cc b/test/validate/pgv_test.cc
index d89f99cb..feee839c 100644
--- a/test/validate/pgv_test.cc
+++ b/test/validate/pgv_test.cc
@@ -4,13 +4,12 @@
 
 // We don't use all the headers in the test below, but including them anyway as
 // a cheap way to get some C++ compiler sanity checking.
-#include "envoy/api/v2/cluster.pb.validate.h"
-#include "envoy/api/v2/endpoint.pb.validate.h"
-#include "envoy/api/v2/listener.pb.validate.h"
-#include "envoy/api/v2/route.pb.validate.h"
-#include "envoy/api/v2/core/protocol.pb.validate.h"
-#include "envoy/config/filter/accesslog/v2/accesslog.pb.validate.h"
-#include "envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.validate.h"
+#include "envoy/config/cluster/v3/cluster.pb.validate.h"
+#include "envoy/config/endpoint/v3/endpoint.pb.validate.h"
+#include "envoy/config/listener/v3/listener.pb.validate.h"
+#include "envoy/config/route/v3/route.pb.validate.h"
+#include "envoy/config/core/v3/protocol.pb.validate.h"
+#include "envoy/config/accesslog/v3/accesslog.pb.validate.h"
 #include "envoy/extensions/compression/gzip/decompressor/v3/gzip.pb.validate.h"
 #include "envoy/extensions/filters/http/buffer/v3/buffer.pb.validate.h"
 #include "envoy/extensions/filters/http/fault/v3/fault.pb.validate.h"
@@ -26,9 +25,7 @@
 #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.h"
 #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.validate.h"
 #include "envoy/extensions/health_checkers/redis/v3/redis.pb.validate.h"
-#include "envoy/api/v2/listener/listener.pb.validate.h"
-#include "envoy/api/v2/route/route.pb.validate.h"
-#include "envoy/config/bootstrap/v2/bootstrap.pb.validate.h"
+#include "envoy/config/bootstrap/v3/bootstrap.pb.validate.h"
 
 #include "google/protobuf/text_format.h"
 
@@ -53,8 +50,8 @@ template <class Proto> struct TestCase {
 
 // Basic protoc-gen-validate C++ validation header inclusion and Validate calls
 // from data plane API.
-int main(int argc, char* argv[]) {
-  envoy::config::bootstrap::v2::Bootstrap invalid_bootstrap;
+int main(int /*argc*/, char* /*argv*/[]) {
+  envoy::config::bootstrap::v3::Bootstrap invalid_bootstrap;
   invalid_bootstrap.mutable_static_resources()->add_clusters();
   // This is a baseline test of the validation features we care about. It's
   // probably not worth adding in every filter and field that we want to valid
@@ -68,12 +65,12 @@ int main(int argc, char* argv[]) {
     address { pipe { path: "/" } }
   }
   )EOF";
-  envoy::config::bootstrap::v2::Bootstrap valid_bootstrap;
+  envoy::config::bootstrap::v3::Bootstrap valid_bootstrap;
   if (!google::protobuf::TextFormat::ParseFromString(valid_bootstrap_text, &valid_bootstrap)) {
     std::cerr << "Unable to parse text proto: " << valid_bootstrap_text << std::endl;
     exit(EXIT_FAILURE);
   }
-  TestCase<envoy::config::bootstrap::v2::Bootstrap>{invalid_bootstrap, valid_bootstrap}.run();
+  TestCase<envoy::config::bootstrap::v3::Bootstrap>{invalid_bootstrap, valid_bootstrap}.run();
 
   exit(EXIT_SUCCESS);
 }