diff --git a/test/extensions/clusters/redis/redis_cluster_test.cc b/test/extensions/clusters/redis/redis_cluster_test.cc
index 284dab85ea05..42a77b8445bd 100644
--- a/test/extensions/clusters/redis/redis_cluster_test.cc
+++ b/test/extensions/clusters/redis/redis_cluster_test.cc
@@ -90,10 +90,11 @@ class RedisClusterTest : public testing::Test,
     return addresses;
   }
 
-  void setupFromV3Yaml(const std::string& yaml) {
+  void setupFromV3Yaml(const std::string& yaml, bool avoid_boosting = true) {
     expectRedisSessionCreated();
     NiceMock<Upstream::MockClusterManager> cm;
-    envoy::config::cluster::v3::Cluster cluster_config = Upstream::parseClusterFromV3Yaml(yaml);
+    envoy::config::cluster::v3::Cluster cluster_config =
+        Upstream::parseClusterFromV3Yaml(yaml, avoid_boosting);
     Envoy::Stats::ScopePtr scope = stats_store_.createScope(fmt::format(
         "cluster.{}.", cluster_config.alt_stat_name().empty() ? cluster_config.name()
                                                               : cluster_config.alt_stat_name()));
@@ -121,7 +122,7 @@ class RedisClusterTest : public testing::Test,
         });
   }
 
-  void setupFactoryFromV2Yaml(const std::string& yaml) {
+  void setupFactoryFromV3Yaml(const std::string& yaml) {
     NiceMock<Upstream::MockClusterManager> cm;
     envoy::config::cluster::v3::Cluster cluster_config = Upstream::parseClusterFromV3Yaml(yaml);
     Envoy::Stats::ScopePtr scope = stats_store_.createScope(fmt::format(
@@ -793,12 +794,12 @@ TEST_F(RedisClusterTest, FactoryInitNotRedisClusterTypeFailure) {
         cluster_refresh_timeout: 0.25s
   )EOF";
 
-  EXPECT_THROW_WITH_MESSAGE(setupFactoryFromV2Yaml(basic_yaml_hosts), EnvoyException,
+  EXPECT_THROW_WITH_MESSAGE(setupFactoryFromV3Yaml(basic_yaml_hosts), EnvoyException,
                             "Redis cluster can only created with redis cluster type.");
 }
 
 TEST_F(RedisClusterTest, FactoryInitRedisClusterTypeSuccess) {
-  setupFactoryFromV2Yaml(BasicConfig);
+  setupFactoryFromV3Yaml(BasicConfig);
 }
 
 TEST_F(RedisClusterTest, RedisErrorResponse) {
diff --git a/test/extensions/filters/http/router/config_test.cc b/test/extensions/filters/http/router/config_test.cc
index 34aa098a76ec..1808920fd610 100644
--- a/test/extensions/filters/http/router/config_test.cc
+++ b/test/extensions/filters/http/router/config_test.cc
@@ -27,7 +27,7 @@ TEST(RouterFilterConfigTest, SimpleRouterFilterConfig) {
   )EOF";
 
   envoy::extensions::filters::http::router::v3::Router proto_config;
-  TestUtility::loadFromYaml(yaml_string, proto_config);
+  TestUtility::loadFromYaml(yaml_string, proto_config, false, true);
   NiceMock<Server::Configuration::MockFactoryContext> context;
   RouterFilterConfig factory;
   Http::FilterFactoryCb cb = factory.createFilterFactoryFromProto(proto_config, "stats.", context);
@@ -43,8 +43,8 @@ TEST(RouterFilterConfigTest, BadRouterFilterConfig) {
   )EOF";
 
   envoy::extensions::filters::http::router::v3::Router proto_config;
-  EXPECT_THROW_WITH_REGEX(TestUtility::loadFromYaml(yaml_string, proto_config), EnvoyException,
-                          "route: Cannot find field");
+  EXPECT_THROW_WITH_REGEX(TestUtility::loadFromYaml(yaml_string, proto_config, false, true),
+                          EnvoyException, "route: Cannot find field");
 }
 
 TEST(RouterFilterConfigTest, RouterFilterWithUnsupportedStrictHeaderCheck) {
@@ -54,7 +54,7 @@ TEST(RouterFilterConfigTest, RouterFilterWithUnsupportedStrictHeaderCheck) {
   )EOF";
 
   envoy::extensions::filters::http::router::v3::Router router_config;
-  TestUtility::loadFromYaml(yaml, router_config);
+  TestUtility::loadFromYaml(yaml, router_config, false, true);
 
   NiceMock<Server::Configuration::MockFactoryContext> context;
   RouterFilterConfig factory;
diff --git a/test/extensions/filters/network/dubbo_proxy/config_test.cc b/test/extensions/filters/network/dubbo_proxy/config_test.cc
index c72283f56a3d..bdf4b37204d0 100644
--- a/test/extensions/filters/network/dubbo_proxy/config_test.cc
+++ b/test/extensions/filters/network/dubbo_proxy/config_test.cc
@@ -22,9 +22,9 @@ using DubboProxyProto = envoy::extensions::filters::network::dubbo_proxy::v3::Du
 
 namespace {
 
-DubboProxyProto parseDubboProxyFromV2Yaml(const std::string& yaml) {
+DubboProxyProto parseDubboProxyFromV3Yaml(const std::string& yaml, bool avoid_boosting = true) {
   DubboProxyProto dubbo_proxy;
-  TestUtility::loadFromYaml(yaml, dubbo_proxy);
+  TestUtility::loadFromYaml(yaml, dubbo_proxy, false, avoid_boosting);
   return dubbo_proxy;
 }
 
@@ -92,7 +92,7 @@ TEST_F(DubboFilterConfigTest, DubboProxyWithExplicitRouterConfig) {
       - name: envoy.filters.dubbo.router
     )EOF";
 
-  DubboProxyProto config = parseDubboProxyFromV2Yaml(yaml);
+  DubboProxyProto config = parseDubboProxyFromV3Yaml(yaml);
   testConfig(config);
 }
 
@@ -107,7 +107,7 @@ TEST_F(DubboFilterConfigTest, DubboProxyWithUnknownFilter) {
       - name: envoy.filters.dubbo.router
     )EOF";
 
-  DubboProxyProto config = parseDubboProxyFromV2Yaml(yaml);
+  DubboProxyProto config = parseDubboProxyFromV3Yaml(yaml);
 
   EXPECT_THROW_WITH_REGEX(factory_.createFilterFactoryFromProto(config, context_), EnvoyException,
                           "no_such_filter");
@@ -131,7 +131,7 @@ TEST_F(DubboFilterConfigTest, DubboProxyWithMultipleFilters) {
   DubboFilters::MockFilterConfigFactory factory;
   Registry::InjectFactory<DubboFilters::NamedDubboFilterConfigFactory> registry(factory);
 
-  DubboProxyProto config = parseDubboProxyFromV2Yaml(yaml);
+  DubboProxyProto config = parseDubboProxyFromV3Yaml(yaml);
   testConfig(config);
 
   EXPECT_EQ(1, factory.config_struct_.fields_size());
@@ -156,7 +156,7 @@ TEST_F(DubboFilterConfigTest, CreateFilterChain) {
   DubboFilters::MockFilterConfigFactory factory;
   Registry::InjectFactory<DubboFilters::NamedDubboFilterConfigFactory> registry(factory);
 
-  DubboProxyProto dubbo_config = parseDubboProxyFromV2Yaml(yaml);
+  DubboProxyProto dubbo_config = parseDubboProxyFromV3Yaml(yaml);
 
   NiceMock<Server::Configuration::MockFactoryContext> context;
   DubboFilters::MockFilterChainFactoryCallbacks callbacks;
diff --git a/test/extensions/filters/network/ratelimit/ratelimit_test.cc b/test/extensions/filters/network/ratelimit/ratelimit_test.cc
index e77f6080cba8..96bc8baf679d 100644
--- a/test/extensions/filters/network/ratelimit/ratelimit_test.cc
+++ b/test/extensions/filters/network/ratelimit/ratelimit_test.cc
@@ -40,7 +40,7 @@ class RateLimitFilterTest : public testing::Test {
         .WillByDefault(Return(true));
 
     envoy::extensions::filters::network::ratelimit::v3::RateLimit proto_config{};
-    TestUtility::loadFromYaml(yaml, proto_config);
+    TestUtility::loadFromYaml(yaml, proto_config, false, true);
     config_ = std::make_shared<Config>(proto_config, stats_store_, runtime_);
     client_ = new Filters::Common::RateLimit::MockClient();
     filter_ = std::make_unique<Filter>(config_, Filters::Common::RateLimit::ClientPtr{client_});
diff --git a/test/extensions/filters/network/rocketmq_proxy/config_test.cc b/test/extensions/filters/network/rocketmq_proxy/config_test.cc
index aa56bbe0a29c..3030522c9eb7 100644
--- a/test/extensions/filters/network/rocketmq_proxy/config_test.cc
+++ b/test/extensions/filters/network/rocketmq_proxy/config_test.cc
@@ -22,9 +22,10 @@ namespace RocketmqProxy {
 
 using RocketmqProxyProto = envoy::extensions::filters::network::rocketmq_proxy::v3::RocketmqProxy;
 
-RocketmqProxyProto parseRocketmqProxyFromV2Yaml(const std::string& yaml) {
+RocketmqProxyProto parseRocketmqProxyFromV3Yaml(const std::string& yaml,
+                                                bool avoid_boosting = true) {
   RocketmqProxyProto rocketmq_proxy;
-  TestUtility::loadFromYaml(yaml, rocketmq_proxy);
+  TestUtility::loadFromYaml(yaml, rocketmq_proxy, false, avoid_boosting);
   return rocketmq_proxy;
 }
 
@@ -86,7 +87,7 @@ TEST_F(RocketmqFilterConfigTest, RocketmqProxyWithFullConfig) {
     transient_object_life_span:
       seconds: 30
     )EOF";
-  RocketmqProxyProto config = parseRocketmqProxyFromV2Yaml(yaml);
+  RocketmqProxyProto config = parseRocketmqProxyFromV3Yaml(yaml);
   testConfig(config);
 }
 
@@ -168,4 +169,4 @@ TEST_F(RocketmqFilterConfigTest, ProxyAddressWithNonIpType) {
 } // namespace RocketmqProxy
 } // namespace NetworkFilters
 } // namespace Extensions
-} // namespace Envoy
\ No newline at end of file
+} // namespace Envoy
diff --git a/test/extensions/filters/network/tcp_proxy/config_test.cc b/test/extensions/filters/network/tcp_proxy/config_test.cc
index 3f2296dfc5d7..ff74cf1cb0f8 100644
--- a/test/extensions/filters/network/tcp_proxy/config_test.cc
+++ b/test/extensions/filters/network/tcp_proxy/config_test.cc
@@ -91,7 +91,7 @@ TEST_P(RouteIpListConfigTest, DEPRECATED_FEATURE_TEST(TcpProxy)) {
   )EOF";
 
   envoy::extensions::filters::network::tcp_proxy::v3::TcpProxy proto_config;
-  TestUtility::loadFromJson(json_string, proto_config, true);
+  TestUtility::loadFromJson(json_string, proto_config, true, false);
 
   NiceMock<Server::Configuration::MockFactoryContext> context;
   ConfigFactory factory;
diff --git a/test/extensions/filters/network/thrift_proxy/filters/ratelimit/config_test.cc b/test/extensions/filters/network/thrift_proxy/filters/ratelimit/config_test.cc
index 98d1e8eebef6..98bcf3d482db 100644
--- a/test/extensions/filters/network/thrift_proxy/filters/ratelimit/config_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/filters/ratelimit/config_test.cc
@@ -19,9 +19,9 @@ namespace RateLimitFilter {
 namespace {
 
 envoy::extensions::filters::network::thrift_proxy::filters::ratelimit::v3::RateLimit
-parseRateLimitFromV2Yaml(const std::string& yaml) {
+parseRateLimitFromV3Yaml(const std::string& yaml, bool avoid_boosting = true) {
   envoy::extensions::filters::network::thrift_proxy::filters::ratelimit::v3::RateLimit rate_limit;
-  TestUtility::loadFromYaml(yaml, rate_limit);
+  TestUtility::loadFromYaml(yaml, rate_limit, false, avoid_boosting);
   return rate_limit;
 }
 
@@ -46,7 +46,7 @@ timeout: "1.337s"
       cluster_name: ratelimit_cluster
   )EOF";
 
-  auto proto_config = parseRateLimitFromV2Yaml(yaml_string);
+  auto proto_config = parseRateLimitFromV3Yaml(yaml_string);
 
   NiceMock<Server::Configuration::MockFactoryContext> context;
 
diff --git a/test/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit_test.cc b/test/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit_test.cc
index 292fad5500a6..25659e77b6ef 100644
--- a/test/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit_test.cc
@@ -50,10 +50,10 @@ class ThriftRateLimitFilterTest : public testing::Test {
         .WillByDefault(Return(true));
   }
 
-  void SetUpTest(const std::string& yaml) {
+  void setupTest(const std::string& yaml) {
     envoy::extensions::filters::network::thrift_proxy::filters::ratelimit::v3::RateLimit
         proto_config{};
-    TestUtility::loadFromYaml(yaml, proto_config);
+    TestUtility::loadFromYaml(yaml, proto_config, false, true);
 
     config_ = std::make_shared<Config>(proto_config, local_info_, stats_store_, runtime_, cm_);
 
@@ -94,7 +94,7 @@ class ThriftRateLimitFilterTest : public testing::Test {
 };
 
 TEST_F(ThriftRateLimitFilterTest, NoRoute) {
-  SetUpTest(filter_config_);
+  setupTest(filter_config_);
 
   EXPECT_CALL(*filter_callbacks_.route_, routeEntry()).WillOnce(Return(nullptr));
 
@@ -165,7 +165,7 @@ TEST_F(ThriftRateLimitFilterTest, NoRoute) {
 }
 
 TEST_F(ThriftRateLimitFilterTest, NoCluster) {
-  SetUpTest(filter_config_);
+  setupTest(filter_config_);
 
   ON_CALL(cm_, get(_)).WillByDefault(Return(nullptr));
 
@@ -173,7 +173,7 @@ TEST_F(ThriftRateLimitFilterTest, NoCluster) {
 }
 
 TEST_F(ThriftRateLimitFilterTest, NoApplicableRateLimit) {
-  SetUpTest(filter_config_);
+  setupTest(filter_config_);
 
   filter_callbacks_.route_->route_entry_.rate_limit_policy_.rate_limit_policy_entry_.clear();
   EXPECT_CALL(*client_, limit(_, _, _, _)).Times(0);
@@ -182,7 +182,7 @@ TEST_F(ThriftRateLimitFilterTest, NoApplicableRateLimit) {
 }
 
 TEST_F(ThriftRateLimitFilterTest, NoDescriptor) {
-  SetUpTest(filter_config_);
+  setupTest(filter_config_);
 
   EXPECT_CALL(route_rate_limit_, populateDescriptors(_, _, _, _, _)).Times(1);
   EXPECT_CALL(*client_, limit(_, _, _, _)).Times(0);
@@ -191,7 +191,7 @@ TEST_F(ThriftRateLimitFilterTest, NoDescriptor) {
 }
 
 TEST_F(ThriftRateLimitFilterTest, RuntimeDisabled) {
-  SetUpTest(filter_config_);
+  setupTest(filter_config_);
 
   EXPECT_CALL(runtime_.snapshot_, featureEnabled("ratelimit.thrift_filter_enabled", 100))
       .WillOnce(Return(false));
@@ -200,7 +200,7 @@ TEST_F(ThriftRateLimitFilterTest, RuntimeDisabled) {
 }
 
 TEST_F(ThriftRateLimitFilterTest, OkResponse) {
-  SetUpTest(filter_config_);
+  setupTest(filter_config_);
   InSequence s;
 
   EXPECT_CALL(filter_callbacks_.route_->route_entry_.rate_limit_policy_, getApplicableRateLimit(0))
@@ -233,7 +233,7 @@ TEST_F(ThriftRateLimitFilterTest, OkResponse) {
 }
 
 TEST_F(ThriftRateLimitFilterTest, ImmediateOkResponse) {
-  SetUpTest(filter_config_);
+  setupTest(filter_config_);
   InSequence s;
 
   EXPECT_CALL(route_rate_limit_, populateDescriptors(_, _, _, _, _))
@@ -256,7 +256,7 @@ TEST_F(ThriftRateLimitFilterTest, ImmediateOkResponse) {
 }
 
 TEST_F(ThriftRateLimitFilterTest, ImmediateErrorResponse) {
-  SetUpTest(filter_config_);
+  setupTest(filter_config_);
   InSequence s;
 
   EXPECT_CALL(route_rate_limit_, populateDescriptors(_, _, _, _, _))
@@ -283,7 +283,7 @@ TEST_F(ThriftRateLimitFilterTest, ImmediateErrorResponse) {
 }
 
 TEST_F(ThriftRateLimitFilterTest, ErrorResponse) {
-  SetUpTest(filter_config_);
+  setupTest(filter_config_);
   InSequence s;
 
   EXPECT_CALL(route_rate_limit_, populateDescriptors(_, _, _, _, _))
@@ -313,7 +313,7 @@ TEST_F(ThriftRateLimitFilterTest, ErrorResponse) {
 }
 
 TEST_F(ThriftRateLimitFilterTest, ErrorResponseWithFailureModeAllowOff) {
-  SetUpTest(fail_close_config_);
+  setupTest(fail_close_config_);
   InSequence s;
 
   EXPECT_CALL(route_rate_limit_, populateDescriptors(_, _, _, _, _))
@@ -345,7 +345,7 @@ TEST_F(ThriftRateLimitFilterTest, ErrorResponseWithFailureModeAllowOff) {
 }
 
 TEST_F(ThriftRateLimitFilterTest, LimitResponse) {
-  SetUpTest(filter_config_);
+  setupTest(filter_config_);
   InSequence s;
 
   EXPECT_CALL(route_rate_limit_, populateDescriptors(_, _, _, _, _))
@@ -376,7 +376,7 @@ TEST_F(ThriftRateLimitFilterTest, LimitResponse) {
 }
 
 TEST_F(ThriftRateLimitFilterTest, LimitResponseWithHeaders) {
-  SetUpTest(filter_config_);
+  setupTest(filter_config_);
   InSequence s;
 
   EXPECT_CALL(route_rate_limit_, populateDescriptors(_, _, _, _, _))
@@ -409,7 +409,7 @@ TEST_F(ThriftRateLimitFilterTest, LimitResponseWithHeaders) {
 }
 
 TEST_F(ThriftRateLimitFilterTest, LimitResponseRuntimeDisabled) {
-  SetUpTest(filter_config_);
+  setupTest(filter_config_);
   InSequence s;
 
   EXPECT_CALL(route_rate_limit_, populateDescriptors(_, _, _, _, _))
@@ -434,7 +434,7 @@ TEST_F(ThriftRateLimitFilterTest, LimitResponseRuntimeDisabled) {
 }
 
 TEST_F(ThriftRateLimitFilterTest, ResetDuringCall) {
-  SetUpTest(filter_config_);
+  setupTest(filter_config_);
   InSequence s;
 
   EXPECT_CALL(route_rate_limit_, populateDescriptors(_, _, _, _, _))
@@ -453,7 +453,7 @@ TEST_F(ThriftRateLimitFilterTest, ResetDuringCall) {
 
 TEST_F(ThriftRateLimitFilterTest, RouteRateLimitDisabledForRouteKey) {
   route_rate_limit_.disable_key_ = "test_key";
-  SetUpTest(filter_config_);
+  setupTest(filter_config_);
 
   ON_CALL(runtime_.snapshot_, featureEnabled("ratelimit.test_key.thrift_filter_enabled", 100))
       .WillByDefault(Return(false));
@@ -472,7 +472,7 @@ TEST_F(ThriftRateLimitFilterTest, ConfigValueTest) {
   }
   )EOF";
 
-  SetUpTest(stage_filter_config);
+  setupTest(stage_filter_config);
 
   EXPECT_EQ(5UL, config_->stage());
   EXPECT_EQ("foo", config_->domain());
@@ -485,7 +485,7 @@ TEST_F(ThriftRateLimitFilterTest, DefaultConfigValueTest) {
   }
   )EOF";
 
-  SetUpTest(stage_filter_config);
+  setupTest(stage_filter_config);
 
   EXPECT_EQ(0UL, config_->stage());
   EXPECT_EQ("foo", config_->domain());
diff --git a/test/extensions/filters/network/thrift_proxy/route_matcher_test.cc b/test/extensions/filters/network/thrift_proxy/route_matcher_test.cc
index 0e89c355ae26..079f646d3a91 100644
--- a/test/extensions/filters/network/thrift_proxy/route_matcher_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/route_matcher_test.cc
@@ -21,9 +21,9 @@ namespace Router {
 namespace {
 
 envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration
-parseRouteConfigurationFromV2Yaml(const std::string& yaml) {
+parseRouteConfigurationFromV3Yaml(const std::string& yaml, bool avoid_boosting = true) {
   envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration route_config;
-  TestUtility::loadFromYaml(yaml, route_config);
+  TestUtility::loadFromYaml(yaml, route_config, false, avoid_boosting);
   TestUtility::validate(route_config);
   return route_config;
 }
@@ -43,7 +43,7 @@ name: config
 )EOF";
 
   envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration config =
-      parseRouteConfigurationFromV2Yaml(yaml);
+      parseRouteConfigurationFromV3Yaml(yaml);
 
   RouteMatcher matcher(config);
   MessageMetadata metadata;
@@ -80,7 +80,7 @@ name: config
 )EOF";
 
   envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration config =
-      parseRouteConfigurationFromV2Yaml(yaml);
+      parseRouteConfigurationFromV3Yaml(yaml);
 
   RouteMatcher matcher(config);
   MessageMetadata metadata;
@@ -123,7 +123,7 @@ name: config
 )EOF";
 
   envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration config =
-      parseRouteConfigurationFromV2Yaml(yaml);
+      parseRouteConfigurationFromV3Yaml(yaml);
 
   RouteMatcher matcher(config);
 
@@ -160,7 +160,7 @@ name: config
 )EOF";
 
   envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration config =
-      parseRouteConfigurationFromV2Yaml(yaml);
+      parseRouteConfigurationFromV3Yaml(yaml);
 
   EXPECT_THROW(new RouteMatcher(config), EnvoyException);
 }
@@ -180,7 +180,7 @@ name: config
 )EOF";
 
   envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration config =
-      parseRouteConfigurationFromV2Yaml(yaml);
+      parseRouteConfigurationFromV3Yaml(yaml);
 
   RouteMatcher matcher(config);
   MessageMetadata metadata;
@@ -217,7 +217,7 @@ name: config
 )EOF";
 
   envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration config =
-      parseRouteConfigurationFromV2Yaml(yaml);
+      parseRouteConfigurationFromV3Yaml(yaml);
 
   RouteMatcher matcher(config);
   MessageMetadata metadata;
@@ -260,7 +260,7 @@ name: config
 )EOF";
 
   envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration config =
-      parseRouteConfigurationFromV2Yaml(yaml);
+      parseRouteConfigurationFromV3Yaml(yaml);
 
   RouteMatcher matcher(config);
 
@@ -297,7 +297,7 @@ name: config
 )EOF";
 
   envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration config =
-      parseRouteConfigurationFromV2Yaml(yaml);
+      parseRouteConfigurationFromV3Yaml(yaml);
 
   EXPECT_THROW(new RouteMatcher(config), EnvoyException);
 }
@@ -316,7 +316,7 @@ name: config
 )EOF";
 
   envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration config =
-      parseRouteConfigurationFromV2Yaml(yaml);
+      parseRouteConfigurationFromV3Yaml(yaml);
 
   RouteMatcher matcher(config);
   MessageMetadata metadata;
@@ -349,7 +349,7 @@ name: config
 )EOF";
 
   envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration config =
-      parseRouteConfigurationFromV2Yaml(yaml);
+      parseRouteConfigurationFromV3Yaml(yaml);
 
   RouteMatcher matcher(config);
   MessageMetadata metadata;
@@ -387,7 +387,7 @@ name: config
 )EOF";
 
   envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration config =
-      parseRouteConfigurationFromV2Yaml(yaml);
+      parseRouteConfigurationFromV3Yaml(yaml);
 
   RouteMatcher matcher(config);
   MessageMetadata metadata;
@@ -423,7 +423,7 @@ name: config
 )EOF";
 
   envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration config =
-      parseRouteConfigurationFromV2Yaml(yaml);
+      parseRouteConfigurationFromV3Yaml(yaml);
 
   RouteMatcher matcher(config);
   MessageMetadata metadata;
@@ -460,7 +460,7 @@ name: config
 )EOF";
 
   envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration config =
-      parseRouteConfigurationFromV2Yaml(yaml);
+      parseRouteConfigurationFromV3Yaml(yaml);
 
   RouteMatcher matcher(config);
   MessageMetadata metadata;
@@ -496,7 +496,7 @@ name: config
 )EOF";
 
   envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration config =
-      parseRouteConfigurationFromV2Yaml(yaml);
+      parseRouteConfigurationFromV3Yaml(yaml);
 
   RouteMatcher matcher(config);
   MessageMetadata metadata;
@@ -534,7 +534,7 @@ name: config
 )EOF";
 
   envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration config =
-      parseRouteConfigurationFromV2Yaml(yaml);
+      parseRouteConfigurationFromV3Yaml(yaml);
 
   RouteMatcher matcher(config);
   MessageMetadata metadata;
@@ -590,7 +590,7 @@ name: config
 )EOF";
 
   envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration config =
-      parseRouteConfigurationFromV2Yaml(yaml);
+      parseRouteConfigurationFromV3Yaml(yaml);
   RouteMatcher matcher(config);
   MessageMetadata metadata;
 
@@ -634,7 +634,7 @@ name: config
 )EOF";
 
   const envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration config =
-      parseRouteConfigurationFromV2Yaml(yaml);
+      parseRouteConfigurationFromV3Yaml(yaml);
   EXPECT_THROW(RouteMatcher m(config), EnvoyException);
 }
 
@@ -658,7 +658,7 @@ name: config
 )EOF";
 
   const envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration config =
-      parseRouteConfigurationFromV2Yaml(yaml);
+      parseRouteConfigurationFromV3Yaml(yaml);
   RouteMatcher matcher(config);
   MessageMetadata metadata;
 
@@ -730,7 +730,7 @@ name: config
 )EOF";
 
   const envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration config =
-      parseRouteConfigurationFromV2Yaml(yaml);
+      parseRouteConfigurationFromV3Yaml(yaml);
   RouteMatcher matcher(config);
   MessageMetadata metadata;
   metadata.setMethodName("method1");
@@ -819,7 +819,7 @@ name: config
 )EOF";
 
   const envoy::extensions::filters::network::thrift_proxy::v3::RouteConfiguration config =
-      parseRouteConfigurationFromV2Yaml(yaml);
+      parseRouteConfigurationFromV3Yaml(yaml);
   RouteMatcher matcher(config);
   MessageMetadata metadata;
   metadata.setMethodName("method1");
diff --git a/test/extensions/filters/network/thrift_proxy/router_ratelimit_test.cc b/test/extensions/filters/network/thrift_proxy/router_ratelimit_test.cc
index 4460b8c11c6e..0813d5859026 100644
--- a/test/extensions/filters/network/thrift_proxy/router_ratelimit_test.cc
+++ b/test/extensions/filters/network/thrift_proxy/router_ratelimit_test.cc
@@ -31,9 +31,9 @@ namespace {
 
 class ThriftRateLimitConfigurationTest : public testing::Test {
 public:
-  void initialize(const std::string& yaml) {
+  void initialize(const std::string& yaml, bool avoid_boosting = true) {
     envoy::extensions::filters::network::thrift_proxy::v3::ThriftProxy config;
-    TestUtility::loadFromYaml(yaml, config);
+    TestUtility::loadFromYaml(yaml, config, false, avoid_boosting);
     initialize(config);
   }
 
diff --git a/test/extensions/filters/network/zookeeper_proxy/config_test.cc b/test/extensions/filters/network/zookeeper_proxy/config_test.cc
index 34dc5ca0a651..b133a8f5075b 100644
--- a/test/extensions/filters/network/zookeeper_proxy/config_test.cc
+++ b/test/extensions/filters/network/zookeeper_proxy/config_test.cc
@@ -49,7 +49,7 @@ stat_prefix: test_prefix
   )EOF";
 
   ZooKeeperProxyProtoConfig proto_config;
-  TestUtility::loadFromYamlAndValidate(yaml, proto_config);
+  TestUtility::loadFromYamlAndValidate(yaml, proto_config, false, true);
 
   testing::NiceMock<Server::Configuration::MockFactoryContext> context;
   ZooKeeperConfigFactory factory;
diff --git a/test/extensions/transport_sockets/tls/context_impl_test.cc b/test/extensions/transport_sockets/tls/context_impl_test.cc
index 053f6468796a..60cec6e1fe17 100644
--- a/test/extensions/transport_sockets/tls/context_impl_test.cc
+++ b/test/extensions/transport_sockets/tls/context_impl_test.cc
@@ -591,9 +591,10 @@ class SslServerContextImplTicketTest : public SslContextImplTest {
     loadConfig(server_context_config);
   }
 
-  void loadConfigYaml(const std::string& yaml) {
+  void loadConfigYaml(const std::string& yaml, bool avoid_boosting = true) {
     envoy::extensions::transport_sockets::tls::v3::DownstreamTlsContext tls_context;
-    TestUtility::loadFromYaml(TestEnvironment::substitute(yaml), tls_context);
+    TestUtility::loadFromYaml(TestEnvironment::substitute(yaml), tls_context, false,
+                              avoid_boosting);
     ServerContextConfigImpl cfg(tls_context, factory_context_);
     loadConfig(cfg);
   }
@@ -808,14 +809,15 @@ TEST_F(SslServerContextImplTicketTest, CRLWithNoCA) {
 
 TEST_F(SslServerContextImplTicketTest, VerifySanWithNoCA) {
   const std::string yaml = R"EOF(
-  common_tls_context:
-    tls_certificates:
-      certificate_chain:
-        filename: "{{ test_rundir }}/test/extensions/transport_sockets/tls/test_data/san_dns_cert.pem"
-      private_key:
-        filename: "{{ test_rundir }}/test/extensions/transport_sockets/tls/test_data/san_dns_key.pem"
-    validation_context:
-      verify_subject_alt_name: "spiffe://lyft.com/testclient"
+       common_tls_context:
+          tls_certificates:
+            certificate_chain:
+              filename: "{{ test_rundir }}/test/extensions/transport_sockets/tls/test_data/san_dns_cert.pem"
+            private_key:
+              filename: "{{ test_rundir }}/test/extensions/transport_sockets/tls/test_data/san_dns_key.pem"
+          validation_context:
+            match_subject_alt_names:
+              exact : "spiffe://lyft.com/testclient"
 )EOF";
   EXPECT_THROW_WITH_MESSAGE(loadConfigYaml(yaml), EnvoyException,
                             "SAN-based verification of peer certificates without trusted CA "
diff --git a/test/integration/api_listener_integration_test.cc b/test/integration/api_listener_integration_test.cc
index 0005e9a83f56..e4a206a41a15 100644
--- a/test/integration/api_listener_integration_test.cc
+++ b/test/integration/api_listener_integration_test.cc
@@ -24,8 +24,12 @@ class ApiListenerIntegrationTest : public BaseIntegrationTest,
 
   void SetUp() override {
     config_helper_.addConfigModifier([](envoy::config::bootstrap::v3::Bootstrap& bootstrap) {
+      // currently ApiListener does not trigger this wait
+      // https://github.com/envoyproxy/envoy/blob/0b92c58d08d28ba7ef0ed5aaf44f90f0fccc5dce/test/integration/integration.cc#L454
+      // Thus, the ApiListener has to be added in addition to the already existing listener in the
+      // config.
       bootstrap.mutable_static_resources()->mutable_listeners(0)->MergeFrom(
-          Server::parseListenerFromV2Yaml(apiListenerConfig()));
+          Server::parseListenerFromV3Yaml(apiListenerConfig()));
     });
   }
 
diff --git a/test/integration/echo_integration_test.cc b/test/integration/echo_integration_test.cc
index 001247c3c563..b965d3254d1e 100644
--- a/test/integration/echo_integration_test.cc
+++ b/test/integration/echo_integration_test.cc
@@ -67,7 +67,7 @@ name: new_listener
       [&listener_added_by_worker]() -> void { listener_added_by_worker.setReady(); });
   test_server_->server().dispatcher().post([this, json, &listener_added_by_manager]() -> void {
     EXPECT_TRUE(test_server_->server().listenerManager().addOrUpdateListener(
-        Server::parseListenerFromV2Yaml(json), "", true));
+        Server::parseListenerFromV3Yaml(json), "", true));
     listener_added_by_manager.setReady();
   });
   listener_added_by_worker.waitReady();
diff --git a/test/server/api_listener_test.cc b/test/server/api_listener_test.cc
index aec3e64d2bf7..ff9fa0d02fd0 100644
--- a/test/server/api_listener_test.cc
+++ b/test/server/api_listener_test.cc
@@ -55,7 +55,7 @@ name: test_api_listener
                 cluster: dynamic_forward_proxy_cluster
   )EOF";
 
-  const envoy::config::listener::v3::Listener config = parseListenerFromV2Yaml(yaml);
+  const envoy::config::listener::v3::Listener config = parseListenerFromV3Yaml(yaml);
 
   auto http_api_listener = HttpApiListener(config, *listener_manager_, config.name());
 
@@ -81,7 +81,7 @@ name: test_api_listener
         path: eds path
   )EOF";
 
-  const envoy::config::listener::v3::Listener config = parseListenerFromV2Yaml(yaml);
+  const envoy::config::listener::v3::Listener config = parseListenerFromV3Yaml(yaml);
 
   EXPECT_THROW_WITH_MESSAGE(
       HttpApiListener(config, *listener_manager_, config.name()), EnvoyException,
@@ -115,7 +115,7 @@ name: test_api_listener
                 cluster: dynamic_forward_proxy_cluster
   )EOF";
 
-  const envoy::config::listener::v3::Listener config = parseListenerFromV2Yaml(yaml);
+  const envoy::config::listener::v3::Listener config = parseListenerFromV3Yaml(yaml);
 
   auto http_api_listener = HttpApiListener(config, *listener_manager_, config.name());
 
diff --git a/test/server/listener_manager_impl_quic_only_test.cc b/test/server/listener_manager_impl_quic_only_test.cc
index a4465dcdb937..b19f2458a6d7 100644
--- a/test/server/listener_manager_impl_quic_only_test.cc
+++ b/test/server/listener_manager_impl_quic_only_test.cc
@@ -47,7 +47,7 @@ reuse_port: true
   )EOF",
                                                        Network::Address::IpVersion::v4);
 
-  envoy::config::listener::v3::Listener listener_proto = parseListenerFromV2Yaml(yaml);
+  envoy::config::listener::v3::Listener listener_proto = parseListenerFromV3Yaml(yaml);
   EXPECT_CALL(server_.random_, uuid());
   expectCreateListenSocket(envoy::config::core::v3::SocketOption::STATE_PREBIND,
 #ifdef SO_RXQ_OVFL // SO_REUSEPORT is on as configured
diff --git a/test/server/listener_manager_impl_test.cc b/test/server/listener_manager_impl_test.cc
index 22dfc81d3bc3..0afea3df6b0f 100644
--- a/test/server/listener_manager_impl_test.cc
+++ b/test/server/listener_manager_impl_test.cc
@@ -55,7 +55,7 @@ class ListenerManagerImplWithRealFiltersTest : public ListenerManagerImplTest {
    * Create an IPv4 listener with a given name.
    */
   envoy::config::listener::v3::Listener createIPv4Listener(const std::string& name) {
-    envoy::config::listener::v3::Listener listener = parseListenerFromV2Yaml(R"EOF(
+    envoy::config::listener::v3::Listener listener = parseListenerFromV3Yaml(R"EOF(
       address:
         socket_address: { address: 127.0.0.1, port_value: 1111 }
       filter_chains:
@@ -165,7 +165,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, EmptyFilter) {
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
   EXPECT_EQ(std::chrono::milliseconds(15000),
             manager_->listeners().front().get().listenerFiltersTimeout());
@@ -182,7 +182,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, DefaultListenerPerConnectionBuffe
   )EOF";
 
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1024 * 1024U, manager_->listeners().back().get().perConnectionBufferLimitBytes());
 }
 
@@ -198,7 +198,7 @@ per_connection_buffer_limit_bytes: 8192
   )EOF";
 
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(8192U, manager_->listeners().back().get().perConnectionBufferLimitBytes());
 }
 
@@ -230,7 +230,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, TlsTransportSocket) {
                                                        Network::Address::IpVersion::v4);
 
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   auto filter_chain = findFilterChain(1234, "127.0.0.1", "", "tls", {}, "8.8.8.8", 111);
@@ -267,7 +267,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest,
                                                        Network::Address::IpVersion::v4);
 
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   auto filter_chain = findFilterChain(1234, "127.0.0.1", "", "tls", {}, "8.8.8.8", 111);
@@ -283,24 +283,27 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, DEPRECATED_FEATURE_TEST(TlsContex
     port_value: 1234
 filter_chains:
 - filters: []
-  tls_context:
-    common_tls_context:
-      tls_certificates:
-      - certificate_chain:
-          filename: "{{ test_rundir }}/test/extensions/transport_sockets/tls/test_data/san_uri_cert.pem"
-        private_key:
-          filename: "{{ test_rundir }}/test/extensions/transport_sockets/tls/test_data/san_uri_key.pem"
-      validation_context:
-        trusted_ca:
-          filename: "{{ test_rundir }}/test/extensions/transport_sockets/tls/test_data/ca_cert.pem"
-        verify_subject_alt_name:
-        - localhost
-        - 127.0.0.1
+  transport_socket:
+     name: tls
+     typed_config:
+       "@type": type.googleapis.com/envoy.api.v2.auth.DownstreamTlsContext
+       common_tls_context:
+         tls_certificates:
+         - certificate_chain:
+             filename: "{{ test_rundir }}/test/extensions/transport_sockets/tls/test_data/san_uri_cert.pem"
+           private_key:
+             filename: "{{ test_rundir }}/test/extensions/transport_sockets/tls/test_data/san_uri_key.pem"
+         validation_context:
+           trusted_ca:
+             filename: "{{ test_rundir }}/test/extensions/transport_sockets/tls/test_data/ca_cert.pem"
+           match_subject_alt_names:
+             exact: localhost
+             exact: 127.0.0.1
   )EOF",
                                                        Network::Address::IpVersion::v4);
 
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   auto filter_chain = findFilterChain(1234, "127.0.0.1", "", "tls", {}, "8.8.8.8", 111);
@@ -359,7 +362,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, BadListenerConfig) {
 test: a
   )EOF";
 
-  EXPECT_THROW_WITH_REGEX(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true),
+  EXPECT_THROW_WITH_REGEX(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true),
                           EnvoyException, "test: Cannot find field");
 }
 
@@ -371,7 +374,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, BadListenerConfigNoFilterChains)
     port_value: 1234
   )EOF";
 
-  EXPECT_THROW_WITH_REGEX(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true),
+  EXPECT_THROW_WITH_REGEX(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true),
                           EnvoyException, "no filter chains specified");
 }
 
@@ -387,7 +390,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, BadListenerConfig2UDPListenerFilt
 - name: envoy.filters.listener.original_dst
   )EOF";
 
-  EXPECT_THROW_WITH_REGEX(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true),
+  EXPECT_THROW_WITH_REGEX(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true),
                           EnvoyException, "Only 1 UDP listener filter per listener supported");
 }
 
@@ -404,7 +407,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, BadFilterConfig) {
     typed_config: {}
   )EOF";
 
-  EXPECT_THROW_WITH_REGEX(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true),
+  EXPECT_THROW_WITH_REGEX(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true),
                           EnvoyException, "foo: Cannot find field");
 }
 class NonTerminalFilterFactory : public Configuration::NamedNetworkFilterConfigFactory {
@@ -437,11 +440,11 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, TerminalNotLast) {
 filter_chains:
 - filters:
   - name: non_terminal
-    config: {}
+    typed_config: {}
   )EOF";
 
   EXPECT_THROW_WITH_REGEX(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true), EnvoyException,
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true), EnvoyException,
       "Error: non-terminal filter named non_terminal of type non_terminal is the last "
       "filter in a network filter chain.");
 }
@@ -455,13 +458,13 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, NotTerminalLast) {
 filter_chains:
 - filters:
   - name: envoy.filters.network.tcp_proxy
-    config: {}
+    typed_config: {}
   - name: unknown_but_will_not_be_processed
-    config: {}
+    typed_config: {}
   )EOF";
 
   EXPECT_THROW_WITH_REGEX(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true), EnvoyException,
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true), EnvoyException,
       "Error: terminal filter named envoy.filters.network.tcp_proxy of type "
       "envoy.filters.network.tcp_proxy must be the last filter in a network filter chain.");
 }
@@ -475,10 +478,10 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, BadFilterName) {
 filter_chains:
 - filters:
   - name: invalid
-    config: {}
+    typed_config: {}
   )EOF";
 
-  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true),
+  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true),
                             EnvoyException,
                             "Didn't find a registered implementation for name: 'invalid'");
 }
@@ -522,11 +525,11 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, StatsScopeTest) {
 filter_chains:
 - filters:
   - name: stats_test
-    config: {}
+    typed_config: {}
   )EOF";
 
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, ListenSocketCreationParams(false)));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   manager_->listeners().front().get().listenerScope().counterFromString("foo").inc();
 
   EXPECT_EQ(1UL, server_.stats_store_.counterFromString("bar").value());
@@ -544,7 +547,7 @@ TEST_F(ListenerManagerImplTest, NotDefaultListenerFiltersTimeout) {
   )EOF";
 
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true));
   EXPECT_EQ(std::chrono::milliseconds(),
             manager_->listeners().front().get().listenerFiltersTimeout());
 }
@@ -565,7 +568,7 @@ TEST_F(ListenerManagerImplTest, ModifyOnlyDrainType) {
   ListenerHandle* listener_foo =
       expectListenerCreate(false, true, envoy::config::listener::v3::Listener::MODIFY_ONLY);
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
   checkStats(__LINE__, 1, 0, 0, 0, 1, 0, 0);
 
   EXPECT_CALL(*listener_foo, onDestroy());
@@ -589,7 +592,7 @@ drain_type: default
 
   ListenerHandle* listener_foo = expectListenerCreate(false, true);
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
   checkStats(__LINE__, 1, 0, 0, 0, 1, 0, 0);
 
   // Update foo listener, but with a different address. Should throw.
@@ -608,7 +611,7 @@ drain_type: modify_only
       expectListenerCreate(false, true, envoy::config::listener::v3::Listener::MODIFY_ONLY);
   EXPECT_CALL(*listener_foo_different_address, onDestroy());
   EXPECT_THROW_WITH_MESSAGE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_different_address_yaml),
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_different_address_yaml),
                                     "", true),
       EnvoyException,
       "error updating listener: 'foo' has a different address "
@@ -644,7 +647,7 @@ drain_type: default
 
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
 
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
   checkStats(__LINE__, 1, 0, 0, 0, 1, 0, 0);
   EXPECT_CALL(*listener_foo, onDestroy());
 }
@@ -676,7 +679,7 @@ drain_type: default
 
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
 
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
   checkStats(__LINE__, 1, 0, 0, 0, 1, 0, 0);
   EXPECT_CALL(*listener_foo, onDestroy());
 }
@@ -700,12 +703,12 @@ name: foo
 
   ListenerHandle* listener_foo = expectListenerCreate(false, false);
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", false));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", false));
   checkStats(__LINE__, 1, 0, 0, 0, 1, 0, 0);
   checkConfigDump(R"EOF(
 static_listeners:
   listener:
-    "@type": type.googleapis.com/envoy.api.v2.Listener
+    "@type": type.googleapis.com/envoy.config.listener.v3.Listener
     name: "foo"
     address:
       socket_address:
@@ -727,11 +730,11 @@ name: foo
 filter_chains:
 - filters:
   - name: fake
-    config: {}
+    typed_config: {}
   )EOF";
 
   EXPECT_FALSE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_update1_yaml), "", false));
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_update1_yaml), "", false));
   checkStats(__LINE__, 1, 0, 0, 0, 1, 0, 0);
 
   // Remove foo listener. Should be blocked.
@@ -781,7 +784,7 @@ filter_chains: {}
     ListenerHandle* listener_foo = expectListenerCreate(true, true);
     EXPECT_CALL(server_, initManager()).WillOnce(ReturnRef(server_init_mgr));
     EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-    EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml),
+    EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml),
                                               "version1", true));
     checkStats(__LINE__, 1, 0, 0, 0, 1, 0, 0);
 
@@ -794,7 +797,7 @@ version_info: version1
     warming_state:
       version_info: version1
       listener:
-        "@type": type.googleapis.com/envoy.api.v2.Listener
+        "@type": type.googleapis.com/envoy.config.listener.v3.Listener
         name: foo
         address:
           socket_address:
@@ -834,7 +837,7 @@ version_info: version1
     EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
     // Version 2 listener will be initialized by listener manager directly.
     EXPECT_CALL(listener_foo2->target_, initialize()).Times(1);
-    EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml),
+    EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml),
                                               "version2", true));
     // Version2 is in warming list as listener_foo2->target_ is not ready yet.
     checkStats(__LINE__, /*added=*/2, 0, /*removed=*/1, /*warming=*/1, 0, 0, 0);
@@ -847,7 +850,7 @@ version_info: version1
       warming_state:
         version_info: version2
         listener:
-          "@type": type.googleapis.com/envoy.api.v2.Listener
+          "@type": type.googleapis.com/envoy.config.listener.v3.Listener
           name: foo
           address:
             socket_address:
@@ -897,7 +900,7 @@ filter_chains: {}
   ListenerHandle* listener_foo = expectListenerCreate(false, true);
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
   EXPECT_TRUE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "version1", true));
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "version1", true));
   checkStats(__LINE__, 1, 0, 0, 0, 1, 0, 0);
 
   // Start workers and capture ListenerImpl.
@@ -932,7 +935,7 @@ name: foo
   auto* timer = new Event::MockTimer(dynamic_cast<Event::MockDispatcher*>(&server_.dispatcher()));
   EXPECT_CALL(*timer, enableTimer(_, _));
   EXPECT_TRUE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_update1_yaml), "", true));
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_update1_yaml), "", true));
   EXPECT_EQ(1UL, manager_->listeners().size());
 
   worker_->callAddCompletion(true);
@@ -976,7 +979,7 @@ filter_chains: {}
   ListenerHandle* listener_foo = expectListenerCreate(false, true);
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
   EXPECT_TRUE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "version1", true));
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "version1", true));
   checkStats(__LINE__, 1, 0, 0, 0, 1, 0, 0);
   EXPECT_CALL(*lds_api, versionInfo()).WillOnce(Return("version1"));
   checkConfigDump(R"EOF(
@@ -987,7 +990,7 @@ version_info: version1
     warming_state:
       version_info: version1
       listener:
-        "@type": type.googleapis.com/envoy.api.v2.Listener
+        "@type": type.googleapis.com/envoy.config.listener.v3.Listener
         name: foo
         address:
           socket_address:
@@ -1000,7 +1003,7 @@ version_info: version1
 )EOF");
 
   // Update duplicate should be a NOP.
-  EXPECT_FALSE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_FALSE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
   checkStats(__LINE__, 1, 0, 0, 0, 1, 0, 0);
 
   // Update foo listener. Should share socket.
@@ -1018,7 +1021,7 @@ per_connection_buffer_limit_bytes: 10
 
   ListenerHandle* listener_foo_update1 = expectListenerCreate(false, true);
   EXPECT_CALL(*listener_foo, onDestroy());
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_update1_yaml),
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_update1_yaml),
                                             "version2", true));
   checkStats(__LINE__, 1, 1, 0, 0, 1, 0, 0);
   EXPECT_CALL(*lds_api, versionInfo()).WillOnce(Return("version2"));
@@ -1030,7 +1033,7 @@ version_info: version2
     warming_state:
       version_info: version2
       listener:
-        "@type": type.googleapis.com/envoy.api.v2.Listener
+        "@type": type.googleapis.com/envoy.config.listener.v3.Listener
         name: foo
         address:
           socket_address:
@@ -1067,7 +1070,7 @@ version_info: version2
 
   // Update duplicate should be a NOP.
   EXPECT_FALSE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_update1_yaml), "", true));
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_update1_yaml), "", true));
   checkStats(__LINE__, 1, 1, 0, 0, 1, 0, 0);
 
   time_system_.setSystemTime(std::chrono::milliseconds(3003003003003));
@@ -1079,7 +1082,7 @@ version_info: version2
   EXPECT_CALL(*worker_, stopListener(_, _));
   EXPECT_CALL(*listener_foo_update1->drain_manager_, startDrainSequence(_));
   EXPECT_TRUE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "version3", true));
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "version3", true));
   worker_->callAddCompletion(true);
   checkStats(__LINE__, 1, 2, 0, 0, 1, 1, 0);
   EXPECT_CALL(*lds_api, versionInfo()).WillOnce(Return("version3"));
@@ -1091,7 +1094,7 @@ version_info: version3
     active_state:
       version_info: version3
       listener:
-        "@type": type.googleapis.com/envoy.api.v2.Listener
+        "@type": type.googleapis.com/envoy.config.listener.v3.Listener
         name: foo
         address:
           socket_address:
@@ -1104,7 +1107,7 @@ version_info: version3
     draining_state:
       version_info: version2
       listener:
-        "@type": type.googleapis.com/envoy.api.v2.Listener
+        "@type": type.googleapis.com/envoy.config.listener.v3.Listener
         name: foo
         address:
           socket_address:
@@ -1140,7 +1143,7 @@ filter_chains: {}
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
   EXPECT_CALL(*worker_, addListener(_, _, _));
   EXPECT_TRUE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_bar_yaml), "version4", true));
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_bar_yaml), "version4", true));
   EXPECT_EQ(2UL, manager_->listeners().size());
   worker_->callAddCompletion(true);
   checkStats(__LINE__, 2, 2, 0, 0, 2, 0, 0);
@@ -1161,7 +1164,7 @@ filter_chains: {}
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
   EXPECT_CALL(listener_baz->target_, initialize());
   EXPECT_TRUE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_baz_yaml), "version5", true));
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_baz_yaml), "version5", true));
   EXPECT_EQ(2UL, manager_->listeners().size());
   checkStats(__LINE__, 3, 2, 0, 1, 2, 0, 0);
   EXPECT_CALL(*lds_api, versionInfo()).WillOnce(Return("version5"));
@@ -1172,7 +1175,7 @@ version_info: version5
     active_state:
       version_info: version3
       listener:
-        "@type": type.googleapis.com/envoy.api.v2.Listener
+        "@type": type.googleapis.com/envoy.config.listener.v3.Listener
         name: foo
         address:
           socket_address:
@@ -1186,7 +1189,7 @@ version_info: version5
     active_state:
       version_info: version4
       listener:
-        "@type": type.googleapis.com/envoy.api.v2.Listener
+        "@type": type.googleapis.com/envoy.config.listener.v3.Listener
         name: bar
         address:
           socket_address:
@@ -1200,7 +1203,7 @@ version_info: version5
     warming_state:
       version_info: version5
       listener:
-        "@type": type.googleapis.com/envoy.api.v2.Listener
+        "@type": type.googleapis.com/envoy.config.listener.v3.Listener
         name: baz
         address:
           socket_address:
@@ -1213,7 +1216,7 @@ version_info: version5
 )EOF");
 
   // Update a duplicate baz that is currently warming.
-  EXPECT_FALSE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_baz_yaml), "", true));
+  EXPECT_FALSE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_baz_yaml), "", true));
   checkStats(__LINE__, 3, 2, 0, 1, 2, 0, 0);
 
   // Update baz while it is warming.
@@ -1226,7 +1229,7 @@ name: baz
 filter_chains:
 - filters:
   - name: fake
-    config: {}
+    typed_config: {}
   )EOF";
 
   ListenerHandle* listener_baz_update1 = expectListenerCreate(true, true);
@@ -1236,7 +1239,7 @@ name: baz
   }));
   EXPECT_CALL(listener_baz_update1->target_, initialize());
   EXPECT_TRUE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_baz_update1_yaml), "", true));
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_baz_update1_yaml), "", true));
   EXPECT_EQ(2UL, manager_->listeners().size());
   checkStats(__LINE__, 3, 3, 0, 1, 2, 0, 0);
 
@@ -1276,7 +1279,7 @@ name: foo
   ListenerHandle* listener_foo = expectListenerCreate(false, true);
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
   EXPECT_CALL(*worker_, addListener(_, _, _));
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
   worker_->callAddCompletion(true);
   checkStats(__LINE__, 1, 0, 0, 0, 1, 0, 0);
 
@@ -1298,7 +1301,7 @@ name: foo
   // Add foo again. We should use the socket from draining.
   ListenerHandle* listener_foo2 = expectListenerCreate(false, true);
   EXPECT_CALL(*worker_, addListener(_, _, _));
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
   worker_->callAddCompletion(true);
   checkStats(__LINE__, 2, 0, 1, 0, 1, 1, 0);
 
@@ -1336,7 +1339,7 @@ name: foo
   ListenerHandle* listener_foo = expectListenerCreate(false, true);
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
   EXPECT_CALL(*worker_, addListener(_, _, _));
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
   worker_->callAddCompletion(true);
   checkStats(__LINE__, 1, 0, 0, 0, 1, 0, 0);
 
@@ -1354,7 +1357,7 @@ name: foo
   ListenerHandle* listener_foo2 = expectListenerCreate(false, true);
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
   EXPECT_CALL(*worker_, addListener(_, _, _));
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
   worker_->callAddCompletion(true);
   checkStats(__LINE__, 2, 0, 1, 0, 1, 1, 0);
 
@@ -1400,7 +1403,7 @@ name: foo
       }));
   EXPECT_CALL(listener_foo->target_, initialize());
   EXPECT_CALL(*listener_foo, onDestroy());
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
 }
 
 TEST_F(ListenerManagerImplTest, ReusePortEqualToTrue) {
@@ -1435,7 +1438,7 @@ reuse_port: true
       }));
   EXPECT_CALL(listener_foo->target_, initialize());
   EXPECT_CALL(*listener_foo, onDestroy());
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
 }
 
 TEST_F(ListenerManagerImplTest, NotSupportedDatagramUds) {
@@ -1468,14 +1471,14 @@ name: foo
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}))
       .WillOnce(Throw(EnvoyException("can't bind")));
   EXPECT_CALL(*listener_foo, onDestroy());
-  EXPECT_THROW(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true),
+  EXPECT_THROW(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true),
                EnvoyException);
   checkConfigDump(R"EOF(
 dynamic_listeners:
   - name: foo
     error_state:
       failed_configuration:
-        "@type": type.googleapis.com/envoy.api.v2.Listener
+        "@type": type.googleapis.com/envoy.config.listener.v3.Listener
         name: foo
         address:
           socket_address:
@@ -1556,7 +1559,7 @@ name: foo
   ListenerHandle* listener_foo = expectListenerCreate(false, true);
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
   EXPECT_CALL(*worker_, addListener(_, _, _));
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
   worker_->callAddCompletion(true);
   checkStats(__LINE__, 1, 0, 0, 0, 1, 0, 0);
 
@@ -1610,7 +1613,7 @@ name: foo
   ListenerHandle* listener_foo = expectListenerCreate(true, true);
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
   EXPECT_CALL(listener_foo->target_, initialize());
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
   EXPECT_EQ(0UL, manager_->listeners().size());
   checkStats(__LINE__, 1, 0, 0, 1, 0, 0, 0);
 
@@ -1624,7 +1627,7 @@ name: foo
   listener_foo = expectListenerCreate(true, true);
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
   EXPECT_CALL(listener_foo->target_, initialize());
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
   checkStats(__LINE__, 2, 0, 1, 1, 0, 0, 0);
   EXPECT_CALL(*worker_, addListener(_, _, _));
   listener_foo->target_.ready();
@@ -1647,7 +1650,7 @@ per_connection_buffer_limit_bytes: 999
   ListenerHandle* listener_foo_update1 = expectListenerCreate(true, true);
   EXPECT_CALL(listener_foo_update1->target_, initialize());
   EXPECT_TRUE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_update1_yaml), "", true));
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_update1_yaml), "", true));
   EXPECT_EQ(1UL, manager_->listeners().size());
   checkStats(__LINE__, 2, 1, 1, 1, 1, 0, 0);
 
@@ -1690,7 +1693,7 @@ traffic_direction: INBOUND
   ListenerHandle* listener_foo = expectListenerCreate(true, true);
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
   EXPECT_CALL(listener_foo->target_, initialize());
-  auto foo_inbound_proto = parseListenerFromV2Yaml(listener_foo_yaml);
+  auto foo_inbound_proto = parseListenerFromV3Yaml(listener_foo_yaml);
   EXPECT_TRUE(manager_->addOrUpdateListener(foo_inbound_proto, "", true));
   checkStats(__LINE__, 1, 0, 0, 1, 0, 0, 0);
   EXPECT_CALL(*worker_, addListener(_, _, _));
@@ -1715,7 +1718,7 @@ traffic_direction: OUTBOUND
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
   EXPECT_CALL(listener_foo_outbound->target_, initialize());
   EXPECT_TRUE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_outbound_yaml), "", true));
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_outbound_yaml), "", true));
   EXPECT_CALL(*worker_, addListener(_, _, _));
   listener_foo_outbound->target_.ready();
   worker_->callAddCompletion(true);
@@ -1743,7 +1746,7 @@ traffic_direction: OUTBOUND
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
   EXPECT_CALL(*worker_, addListener(_, _, _));
   EXPECT_TRUE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_bar_outbound_yaml), "", true));
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_bar_outbound_yaml), "", true));
   EXPECT_EQ(3UL, manager_->listeners().size());
   worker_->callAddCompletion(true);
 
@@ -1758,7 +1761,7 @@ traffic_direction: INBOUND
 filter_chains:
 - filters: []
   )EOF";
-  EXPECT_FALSE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_bar_yaml), "", true));
+  EXPECT_FALSE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_bar_yaml), "", true));
 
   // Explicitly validate that in place filter chain update is not allowed.
   auto in_place_foo_inbound_proto = foo_inbound_proto;
@@ -1794,7 +1797,7 @@ name: foo
   ListenerHandle* listener_foo = expectListenerCreate(true, true);
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
   EXPECT_CALL(listener_foo->target_, initialize());
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
   checkStats(__LINE__, 1, 0, 0, 1, 0, 0, 0);
   EXPECT_CALL(*worker_, addListener(_, _, _));
   listener_foo->target_.ready();
@@ -1818,7 +1821,7 @@ name: bar
 filter_chains:
 - filters: []
   )EOF";
-  EXPECT_FALSE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_bar_yaml), "", true));
+  EXPECT_FALSE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_bar_yaml), "", true));
 }
 
 // Validate that stopping a warming listener, removes directly from warming listener list.
@@ -1843,7 +1846,7 @@ traffic_direction: INBOUND
   ListenerHandle* listener_foo = expectListenerCreate(true, true);
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
   EXPECT_CALL(listener_foo->target_, initialize());
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
   checkStats(__LINE__, 1, 0, 0, 1, 0, 0, 0);
   EXPECT_CALL(*worker_, addListener(_, _, _));
   listener_foo->target_.ready();
@@ -1867,7 +1870,7 @@ per_connection_buffer_limit_bytes: 999
   ListenerHandle* listener_foo_update1 = expectListenerCreate(true, true);
   EXPECT_CALL(listener_foo_update1->target_, initialize());
   EXPECT_TRUE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_update1_yaml), "", true));
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_update1_yaml), "", true));
   EXPECT_EQ(1UL, manager_->listeners().size());
 
   // Stop foo which should remove warming listener.
@@ -1899,7 +1902,7 @@ name: foo
   ListenerHandle* listener_foo = expectListenerCreate(false, true);
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
   EXPECT_CALL(*worker_, addListener(_, _, _));
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
 
   EXPECT_CALL(*worker_, stopListener(_, _));
   EXPECT_CALL(*listener_foo->drain_manager_, startDrainSequence(_));
@@ -1936,7 +1939,7 @@ name: foo
   ListenerHandle* listener_foo = expectListenerCreate(false, false);
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
   EXPECT_CALL(*worker_, addListener(_, _, _));
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", false));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", false));
 
   EXPECT_CALL(*worker_, stopListener(_, _));
   EXPECT_CALL(*listener_foo->drain_manager_, startDrainSequence(_));
@@ -1964,7 +1967,7 @@ TEST_F(ListenerManagerImplTest, StatsNameValidCharacterTest) {
 - filters: []
   )EOF";
 
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   manager_->listeners().front().get().listenerScope().counterFromString("foo").inc();
 
   EXPECT_EQ(1UL, server_.stats_store_.counterFromString("listener.[__1]_10000.foo").value());
@@ -1992,7 +1995,7 @@ name: foo
   ListenerHandle* listener_foo = expectListenerCreate(true, true);
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, ListenSocketCreationParams(false)));
   EXPECT_CALL(listener_foo->target_, initialize());
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
 
   // Add bar with same non-binding address. Should fail.
   const std::string listener_bar_yaml = R"EOF(
@@ -2010,7 +2013,7 @@ name: bar
   ListenerHandle* listener_bar = expectListenerCreate(true, true);
   EXPECT_CALL(*listener_bar, onDestroy());
   EXPECT_THROW_WITH_MESSAGE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_bar_yaml), "", true),
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_bar_yaml), "", true),
       EnvoyException,
       "error adding listener: 'bar' has duplicate address '0.0.0.0:1234' as existing listener");
 
@@ -2022,7 +2025,7 @@ name: bar
   listener_bar = expectListenerCreate(true, true);
   EXPECT_CALL(*listener_bar, onDestroy());
   EXPECT_THROW_WITH_MESSAGE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_bar_yaml), "", true),
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_bar_yaml), "", true),
       EnvoyException,
       "error adding listener: 'bar' has duplicate address '0.0.0.0:1234' as existing listener");
 
@@ -2043,7 +2046,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithDestinationP
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
         destination_port: 8080
@@ -2060,7 +2063,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithDestinationP
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   // IPv4 client connects to unknown port - no match.
@@ -2089,7 +2092,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithDestinationI
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
         prefix_ranges: { address_prefix: 127.0.0.0, prefix_len: 8 }
@@ -2106,7 +2109,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithDestinationI
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   // IPv4 client connects to unknown IP - no match.
@@ -2135,7 +2138,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithServerNamesM
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
         server_names: "server1.example.com"
@@ -2152,7 +2155,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithServerNamesM
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   // TLS client without SNI - no match.
@@ -2182,7 +2185,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithTransportPro
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
         transport_protocol: "tls"
@@ -2199,7 +2202,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithTransportPro
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   // TCP client - no match.
@@ -2224,7 +2227,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithApplicationP
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
         application_protocols: "http/1.1"
@@ -2242,7 +2245,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithApplicationP
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   // TLS client without ALPN - no match.
@@ -2271,10 +2274,10 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithSourceTypeMa
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
-        source_type: LOCAL
+        source_type: SAME_IP_OR_LOOPBACK
       transport_socket:
         name: tls
         typed_config:
@@ -2288,7 +2291,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithSourceTypeMa
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   // EXTERNAL IPv4 client without "http/1.1" ALPN - no match.
@@ -2330,7 +2333,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithSourceIpMatc
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
         source_prefix_ranges:
@@ -2349,7 +2352,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithSourceIpMatc
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   // IPv4 client with source 10.0.1.1. No match.
@@ -2390,7 +2393,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithSourceIpv6Ma
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
         source_prefix_ranges:
@@ -2409,7 +2412,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithSourceIpv6Ma
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   // IPv6 client with matching subnet. Match.
@@ -2430,7 +2433,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithSourcePortMa
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
         source_ports:
@@ -2448,7 +2451,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithSourcePortMa
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   // Client with source port 100. Match.
@@ -2477,10 +2480,10 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainWithSourceType
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
-        source_type: LOCAL
+        source_type: SAME_IP_OR_LOOPBACK
       transport_socket:
         name: tls
         typed_config:
@@ -2515,7 +2518,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainWithSourceType
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   // LOCAL TLS client with "http/1.1" ALPN - no match.
@@ -2565,7 +2568,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithDestinati
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
         # empty
@@ -2602,7 +2605,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithDestinati
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   // IPv4 client connects to default port - using 1st filter chain.
@@ -2651,7 +2654,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithDestinati
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
         # empty
@@ -2688,7 +2691,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithDestinati
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   // IPv4 client connects to default IP - using 1st filter chain.
@@ -2737,7 +2740,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithServerNam
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
         # empty
@@ -2783,7 +2786,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithServerNam
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   // TLS client without SNI - using 1st filter chain.
@@ -2836,7 +2839,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithTransport
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
         # empty
@@ -2855,7 +2858,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithTransport
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   // TCP client - using 1st filter chain.
@@ -2881,7 +2884,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithApplicati
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
         # empty
@@ -2900,7 +2903,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithApplicati
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   // TLS client without ALPN - using 1st filter chain.
@@ -2929,7 +2932,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithMultipleR
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
         # empty
@@ -2950,7 +2953,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithMultipleR
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   // TLS client without SNI and ALPN - using 1st filter chain.
@@ -2992,7 +2995,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithDifferent
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
         server_names: "example.com"
@@ -3025,7 +3028,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithDifferent
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 }
 
@@ -3036,7 +3039,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest,
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
         server_names: "example.com"
@@ -3066,7 +3069,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest,
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 }
 
@@ -3076,14 +3079,14 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithInvalidDesti
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
         prefix_ranges: { address_prefix: a.b.c.d, prefix_len: 32 }
   )EOF",
                                                        Network::Address::IpVersion::v4);
 
-  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true),
+  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true),
                             EnvoyException, "malformed IP address: a.b.c.d");
 }
 
@@ -3093,14 +3096,14 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SingleFilterChainWithInvalidServe
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
         server_names: "*w.example.com"
   )EOF",
                                                        Network::Address::IpVersion::v4);
 
-  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true),
+  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true),
                             EnvoyException,
                             "error adding listener '127.0.0.1:1234': partial wildcards are not "
                             "supported in \"server_names\"");
@@ -3112,7 +3115,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithSameMatch
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
         transport_protocol: "tls"
@@ -3121,7 +3124,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithSameMatch
   )EOF",
                                                        Network::Address::IpVersion::v4);
 
-  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true),
+  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true),
                             EnvoyException,
                             "error adding listener '127.0.0.1:1234': multiple filter chains with "
                             "the same matching rules are defined");
@@ -3134,7 +3137,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest,
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
         transport_protocol: "tls"
@@ -3144,7 +3147,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest,
   )EOF",
                                                        Network::Address::IpVersion::v4);
 
-  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true),
+  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true),
                             EnvoyException,
                             "error adding listener '127.0.0.1:1234': contains filter chains with "
                             "unimplemented fields");
@@ -3156,7 +3159,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithOverlappi
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.filters.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
         server_names: "example.com"
@@ -3165,7 +3168,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, MultipleFilterChainsWithOverlappi
   )EOF",
                                                        Network::Address::IpVersion::v4);
 
-  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true),
+  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true),
                             EnvoyException,
                             "error adding listener '127.0.0.1:1234': multiple filter chains with "
                             "overlapping matching rules are defined");
@@ -3185,7 +3188,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, TlsFilterChainWithoutTlsInspector
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   // TLS Inspector is automatically injected for filter chains with TLS requirements,
@@ -3207,7 +3210,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest,
       socket_address: { address: 127.0.0.1, port_value: 1234 }
     listener_filters:
     - name: "envoy.listener.tls_inspector"
-      config: {}
+      typed_config: {}
     filter_chains:
     - filter_chain_match:
         transport_protocol: "tls"
@@ -3218,7 +3221,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest,
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   // Make sure there is exactly 1 listener filter (and assume it's TLS Inspector). 2 filters
@@ -3246,7 +3249,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, SniFilterChainWithoutTlsInspector
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   // TLS Inspector is automatically injected for filter chains with SNI requirements,
@@ -3274,7 +3277,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, AlpnFilterChainWithoutTlsInspecto
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   // TLS Inspector is automatically injected for filter chains with ALPN requirements,
@@ -3303,7 +3306,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, CustomTransportProtocolWithSniWit
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   // Make sure there are no listener filters (i.e. no automatically injected TLS Inspector).
@@ -3342,7 +3345,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, TlsCertificateInline) {
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 }
 
@@ -3367,7 +3370,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, TlsCertificateChainInlinePrivateK
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 }
 
@@ -3387,7 +3390,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, TlsCertificateIncomplete) {
                                                        Network::Address::IpVersion::v4);
 
   EXPECT_THROW_WITH_MESSAGE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true), EnvoyException,
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true), EnvoyException,
       TestEnvironment::substitute(
           "Failed to load incomplete certificate from {{ test_rundir }}"
           "/test/extensions/transport_sockets/tls/test_data/san_dns3_chain.pem, ",
@@ -3410,7 +3413,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, TlsCertificateInvalidCertificateC
   )EOF",
                                                        Network::Address::IpVersion::v4);
 
-  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true),
+  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true),
                             EnvoyException, "Failed to load certificate chain from <inline>");
 }
 
@@ -3436,7 +3439,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, TlsCertificateInvalidIntermediate
   )EOF"),
       Network::Address::IpVersion::v4);
 
-  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true),
+  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true),
                             EnvoyException, "Failed to load certificate chain from <inline>");
 }
 
@@ -3456,7 +3459,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, TlsCertificateInvalidPrivateKey)
   )EOF",
                                                        Network::Address::IpVersion::v4);
 
-  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true),
+  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true),
                             EnvoyException, "Failed to load private key from <inline>");
 }
 
@@ -3478,7 +3481,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, TlsCertificateInvalidTrustedCA) {
   )EOF",
                                                        Network::Address::IpVersion::v4);
 
-  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true),
+  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true),
                             EnvoyException, "Failed to load trusted CA certificates from <inline>");
 }
 
@@ -3504,7 +3507,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, Metadata) {
                 route: { cluster: service_foo }
     listener_filters:
     - name: "envoy.filters.listener.original_dst"
-      config: {}
+      typed_config: {}
   )EOF",
                                                        Network::Address::IpVersion::v4);
   Configuration::ListenerFactoryContext* listener_factory_context = nullptr;
@@ -3519,7 +3522,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, Metadata) {
             listener_factory_context = &context;
             return ProdListenerComponentFactory::createListenerFilterFactoryList_(filters, context);
           }));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   ASSERT_NE(nullptr, listener_factory_context);
   EXPECT_EQ("test_value", Config::Metadata::metadataValue(
                               &listener_factory_context->listenerMetadata(), "com.bar.foo", "baz")
@@ -3534,13 +3537,13 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, OriginalDstFilter) {
     filter_chains: {}
     listener_filters:
     - name: "envoy.filters.listener.original_dst"
-      config: {}
+      typed_config: {}
   )EOF",
                                                        Network::Address::IpVersion::v4);
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   Network::ListenerConfig& listener = manager_->listeners().back().get();
@@ -3609,13 +3612,13 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, OriginalDstTestFilter) {
     filter_chains: {}
     listener_filters:
     - name: "test.listener.original_dst"
-      config: {}
+      typed_config: {}
   )EOF",
                                                        Network::Address::IpVersion::v4);
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   Network::ListenerConfig& listener = manager_->listeners().back().get();
@@ -3683,13 +3686,13 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, OriginalDstTestFilterIPv6) {
     filter_chains: {}
     listener_filters:
     - name: "test.listener.original_dstipv6"
-      config: {}
+      typed_config: {}
   )EOF",
                                                        Network::Address::IpVersion::v6);
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 
   Network::ListenerConfig& listener = manager_->listeners().back().get();
@@ -3738,7 +3741,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, TransparentFreebindListenerDisabl
         EXPECT_EQ(options, nullptr);
         return listener_factory_.socket_;
       }));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 }
 
@@ -3814,7 +3817,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, ReusePortListenerDisabled) {
 }
 
 TEST_F(ListenerManagerImplWithRealFiltersTest, LiteralSockoptListenerEnabled) {
-  const envoy::config::listener::v3::Listener listener = parseListenerFromV2Yaml(R"EOF(
+  const envoy::config::listener::v3::Listener listener = parseListenerFromV3Yaml(R"EOF(
     name: SockoptsListener
     address:
       socket_address: { address: 127.0.0.1, port_value: 1111 }
@@ -3862,7 +3865,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, AddressResolver) {
   Registry::InjectFactory<Network::Address::Resolver> register_resolver(mock_resolver);
 
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 }
 
@@ -3887,7 +3890,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, CRLFilename) {
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 }
 
@@ -3915,7 +3918,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, CRLInline) {
 
   EXPECT_CALL(server_.random_, uuid());
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
-  manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true);
+  manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true);
   EXPECT_EQ(1U, manager_->listeners().size());
 }
 
@@ -3938,7 +3941,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, InvalidCRLInline) {
   )EOF",
                                                        Network::Address::IpVersion::v4);
 
-  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true),
+  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true),
                             EnvoyException, "Failed to load CRL from <inline>");
 }
 
@@ -3960,7 +3963,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, CRLWithNoCA) {
   )EOF",
                                                        Network::Address::IpVersion::v4);
 
-  EXPECT_THROW_WITH_REGEX(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true),
+  EXPECT_THROW_WITH_REGEX(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true),
                           EnvoyException, "^Failed to load CRL from .* without trusted CA$");
 }
 
@@ -3983,7 +3986,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, VerifySanWithNoCA) {
   )EOF",
                                                        Network::Address::IpVersion::v4);
 
-  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true),
+  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true),
                             EnvoyException,
                             "SAN-based verification of peer certificates without trusted CA "
                             "is insecure and not allowed");
@@ -4008,7 +4011,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, VerifyIgnoreExpirationWithNoCA) {
   )EOF",
                                                        Network::Address::IpVersion::v4);
 
-  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true),
+  EXPECT_THROW_WITH_MESSAGE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true),
                             EnvoyException,
                             "Certificate validity period is always ignored without trusted CA");
 }
@@ -4034,7 +4037,7 @@ TEST_F(ListenerManagerImplWithRealFiltersTest, VerifyIgnoreExpirationWithCA) {
   )EOF",
                                                        Network::Address::IpVersion::v4);
 
-  EXPECT_NO_THROW(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true));
+  EXPECT_NO_THROW(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true));
 }
 
 // Validate that dispatcher stats prefix is set correctly when enabled.
@@ -4068,7 +4071,7 @@ name: test_api_listener
                 cluster: dynamic_forward_proxy_cluster
   )EOF";
 
-  ASSERT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", false));
+  ASSERT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", false));
   EXPECT_EQ(0U, manager_->listeners().size());
   ASSERT_TRUE(manager_->apiListener().has_value());
 }
@@ -4097,7 +4100,7 @@ name: test_api_listener
                 cluster: dynamic_forward_proxy_cluster
   )EOF";
 
-  ASSERT_FALSE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", true));
+  ASSERT_FALSE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", true));
   EXPECT_EQ(0U, manager_->listeners().size());
   ASSERT_FALSE(manager_->apiListener().has_value());
 }
@@ -4149,13 +4152,13 @@ name: test_api_listener_2
                 cluster: dynamic_forward_proxy_cluster
   )EOF";
 
-  ASSERT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", false));
+  ASSERT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", false));
   EXPECT_EQ(0U, manager_->listeners().size());
   ASSERT_TRUE(manager_->apiListener().has_value());
   EXPECT_EQ("test_api_listener", manager_->apiListener()->get().name());
 
   // Only one ApiListener is added.
-  ASSERT_FALSE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(yaml), "", false));
+  ASSERT_FALSE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(yaml), "", false));
   EXPECT_EQ(0U, manager_->listeners().size());
   // The original ApiListener is there.
   ASSERT_TRUE(manager_->apiListener().has_value());
@@ -4183,7 +4186,7 @@ traffic_direction: INBOUND
   ListenerHandle* listener_foo = expectListenerCreate(true, true);
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
   EXPECT_CALL(listener_foo->target_, initialize());
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
   EXPECT_EQ(0, server_.stats_store_.counter("listener_manager.listener_in_place_updated").value());
 
   checkStats(__LINE__, 1, 0, 0, 1, 0, 0, 0);
@@ -4210,7 +4213,7 @@ traffic_direction: INBOUND
   ListenerHandle* listener_foo_update1 = expectListenerOverridden(true);
   EXPECT_CALL(listener_foo_update1->target_, initialize());
   EXPECT_TRUE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_update1_yaml), "", true));
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_update1_yaml), "", true));
   EXPECT_EQ(1, server_.stats_store_.counter("listener_manager.listener_in_place_updated").value());
 
   EXPECT_EQ(1UL, manager_->listeners().size());
@@ -4245,7 +4248,7 @@ traffic_direction: INBOUND
   ListenerHandle* listener_foo = expectListenerCreate(true, true);
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
   EXPECT_CALL(listener_foo->target_, initialize());
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
   EXPECT_EQ(0, server_.stats_store_.counter("listener_manager.listener_in_place_updated").value());
 
   checkStats(__LINE__, 1, 0, 0, 1, 0, 0, 0);
@@ -4271,7 +4274,7 @@ traffic_direction: INBOUND
   ListenerHandle* listener_foo_update1 = expectListenerOverridden(true);
   EXPECT_CALL(listener_foo_update1->target_, initialize());
   EXPECT_TRUE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_update1_yaml), "", true));
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_update1_yaml), "", true));
   EXPECT_EQ(1, server_.stats_store_.counter("listener_manager.listener_in_place_updated").value());
 
   EXPECT_EQ(1UL, manager_->listeners().size());
@@ -4314,7 +4317,7 @@ traffic_direction: INBOUND
   ListenerHandle* listener_foo = expectListenerCreate(true, true);
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
   EXPECT_CALL(listener_foo->target_, initialize());
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
   EXPECT_EQ(0, server_.stats_store_.counter("listener_manager.listener_in_place_updated").value());
 
   checkStats(__LINE__, 1, 0, 0, 1, 0, 0, 0);
@@ -4340,7 +4343,7 @@ traffic_direction: INBOUND
   ListenerHandle* listener_foo_update1 = expectListenerOverridden(true);
   EXPECT_CALL(listener_foo_update1->target_, initialize());
   EXPECT_TRUE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_update1_yaml), "", true));
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_update1_yaml), "", true));
   EXPECT_EQ(1, server_.stats_store_.counter("listener_manager.listener_in_place_updated").value());
 
   EXPECT_EQ(1UL, manager_->listeners().size());
@@ -4377,7 +4380,7 @@ traffic_direction: INBOUND
   ListenerHandle* listener_foo = expectListenerCreate(true, true);
   EXPECT_CALL(listener_factory_, createListenSocket(_, _, _, {true}));
   EXPECT_CALL(listener_foo->target_, initialize());
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
   checkStats(__LINE__, 1, 0, 0, 1, 0, 0, 0);
   EXPECT_CALL(*worker_, addListener(_, _, _));
   listener_foo->target_.ready();
@@ -4401,7 +4404,7 @@ traffic_direction: INBOUND
   ListenerHandle* listener_foo_update1 = expectListenerOverridden(true);
   EXPECT_CALL(listener_foo_update1->target_, initialize());
   EXPECT_TRUE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_update1_yaml), "", true));
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_update1_yaml), "", true));
   EXPECT_EQ(1UL, manager_->listeners().size());
   EXPECT_EQ(1, server_.stats_store_.counter("listener_manager.listener_in_place_updated").value());
   checkStats(__LINE__, 1, 1, 0, 1, 1, 0, 0);
@@ -4615,7 +4618,7 @@ name: foo
 
   EXPECT_CALL(*worker_, addListener(_, _, _));
 
-  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_yaml), "", true));
+  EXPECT_TRUE(manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_yaml), "", true));
   EXPECT_EQ(0, server_.stats_store_.counter("listener_manager.listener_in_place_updated").value());
 
   worker_->callAddCompletion(true);
@@ -4640,7 +4643,7 @@ name: foo
   auto* timer = new Event::MockTimer(dynamic_cast<Event::MockDispatcher*>(&server_.dispatcher()));
   EXPECT_CALL(*timer, enableTimer(_, _));
   EXPECT_TRUE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_update1_yaml), "", true));
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_update1_yaml), "", true));
   EXPECT_EQ(1, server_.stats_store_.counter("listener_manager.listener_in_place_updated").value());
 
   EXPECT_EQ(1UL, manager_->listeners().size());
@@ -4671,7 +4674,7 @@ name: foo
   EXPECT_CALL(*worker_, stopListener(_, _));
   EXPECT_CALL(*listener_foo_update1->drain_manager_, startDrainSequence(_));
   EXPECT_TRUE(
-      manager_->addOrUpdateListener(parseListenerFromV2Yaml(listener_foo_update2_yaml), "", true));
+      manager_->addOrUpdateListener(parseListenerFromV3Yaml(listener_foo_update2_yaml), "", true));
   EXPECT_EQ(1, server_.stats_store_.counter("listener_manager.listener_in_place_updated").value());
 
   EXPECT_CALL(*worker_, removeListener(_, _));
diff --git a/test/server/utility.h b/test/server/utility.h
index 726d427483dd..fafc08ae0500 100644
--- a/test/server/utility.h
+++ b/test/server/utility.h
@@ -12,9 +12,10 @@ namespace Envoy {
 namespace Server {
 namespace {
 
-inline envoy::config::listener::v3::Listener parseListenerFromV2Yaml(const std::string& yaml) {
+inline envoy::config::listener::v3::Listener parseListenerFromV3Yaml(const std::string& yaml,
+                                                                     bool avoid_boosting = true) {
   envoy::config::listener::v3::Listener listener;
-  TestUtility::loadFromYaml(yaml, listener, true);
+  TestUtility::loadFromYaml(yaml, listener, true, avoid_boosting);
   return listener;
 }