diff --git a/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden b/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden
index 85bca3d0132c..9cd146e6ef0d 100644
--- a/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden
+++ b/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden
@@ -53,7 +53,7 @@
                     "ads":  {},
                     "resourceApiVersion":  "V3"
                   },
-                  "routeConfigName":  "default/local/default/api-app"
+                  "routeConfigName":  "default/local/default/api-app:http"
                 },
                 "httpFilters":  [
                   {
@@ -146,7 +146,7 @@
                     "ads":  {},
                     "resourceApiVersion":  "V3"
                   },
-                  "routeConfigName":  "default/local/default/api-app2"
+                  "routeConfigName":  "default/local/default/api-app2:http"
                 },
                 "httpFilters":  [
                   {
diff --git a/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden b/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden
index 0a257675390e..71dec1b4db46 100644
--- a/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden
+++ b/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden
@@ -53,7 +53,7 @@
                     "ads":  {},
                     "resourceApiVersion":  "V3"
                   },
-                  "routeConfigName":  "default/local/default/api-app"
+                  "routeConfigName":  "default/local/default/api-app:http"
                 },
                 "httpFilters":  [
                   {
diff --git a/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden b/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden
index 0a257675390e..71dec1b4db46 100644
--- a/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden
+++ b/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden
@@ -53,7 +53,7 @@
                     "ads":  {},
                     "resourceApiVersion":  "V3"
                   },
-                  "routeConfigName":  "default/local/default/api-app"
+                  "routeConfigName":  "default/local/default/api-app:http"
                 },
                 "httpFilters":  [
                   {
diff --git a/agent/xdsv2/testdata/routes/destination/mixed-multi-destination.golden b/agent/xdsv2/testdata/routes/destination/mixed-multi-destination.golden
index 186e2bf3e8df..ed7ec13bdcdb 100644
--- a/agent/xdsv2/testdata/routes/destination/mixed-multi-destination.golden
+++ b/agent/xdsv2/testdata/routes/destination/mixed-multi-destination.golden
@@ -6,6 +6,7 @@
       "name":  "default/local/default/api-1:http:1.1.1.1:1234",
       "virtualHosts":  [
         {
+          "domains": ["*"],
           "name":  "default/local/default/api-1:http:1.1.1.1:1234",
           "routes":  [
             {
diff --git a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden
index 65c74ed8fa0d..f1b71f1009f9 100644
--- a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden
+++ b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden
@@ -3,17 +3,18 @@
   "resources":  [
     {
       "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name":  "default/local/default/api-app",
+      "name":  "default/local/default/api-app2:http",
       "virtualHosts":  [
         {
-          "name":  "default/local/default/api-app",
+          "domains": ["*"],
+          "name":  "default/local/default/api-app2:http",
           "routes":  [
             {
               "match":  {
                 "prefix":  "/"
               },
               "route":  {
-                "cluster":  "http.api-app.default.dc1.internal.foo.consul"
+                "cluster":  "http.api-app2.default.dc1.internal.foo.consul"
               }
             }
           ]
@@ -23,17 +24,18 @@
     },
     {
       "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name":  "default/local/default/api-app2",
+      "name":  "default/local/default/api-app:http",
       "virtualHosts":  [
         {
-          "name":  "default/local/default/api-app2",
+          "domains": ["*"],
+          "name":  "default/local/default/api-app:http",
           "routes":  [
             {
               "match":  {
                 "prefix":  "/"
               },
               "route":  {
-                "cluster":  "http.api-app2.default.dc1.internal.foo.consul"
+                "cluster":  "http.api-app.default.dc1.internal.foo.consul"
               }
             }
           ]
diff --git a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden
index 44b563e941ac..f61d78647563 100644
--- a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden
+++ b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden
@@ -3,10 +3,11 @@
   "resources":  [
     {
       "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name":  "default/local/default/api-app",
+      "name":  "default/local/default/api-app:http",
       "virtualHosts":  [
         {
-          "name":  "default/local/default/api-app",
+          "domains": ["*"],
+          "name":  "default/local/default/api-app:http",
           "routes":  [
             {
               "match":  {
diff --git a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden
index 44b563e941ac..f61d78647563 100644
--- a/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden
+++ b/agent/xdsv2/testdata/routes/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden
@@ -3,10 +3,11 @@
   "resources":  [
     {
       "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name":  "default/local/default/api-app",
+      "name":  "default/local/default/api-app:http",
       "virtualHosts":  [
         {
-          "name":  "default/local/default/api-app",
+          "domains": ["*"],
+          "name":  "default/local/default/api-app:http",
           "routes":  [
             {
               "match":  {