diff --git a/config/envoyconfig/testdata/main_http_connection_manager_filter.json b/config/envoyconfig/testdata/main_http_connection_manager_filter.json
index be7016000..661b36b1d 100644
--- a/config/envoyconfig/testdata/main_http_connection_manager_filter.json
+++ b/config/envoyconfig/testdata/main_http_connection_manager_filter.json
@@ -120,506 +120,12 @@
       ]
     },
     "requestTimeout": "30s",
-    "routeConfig": {
-      "name": "main",
-      "validateClusters": false,
-      "virtualHosts": [
-        {
-          "domains": ["authenticate.example.com"],
-          "name": "authenticate.example.com",
-          "responseHeadersToAdd": [
-            {
-              "appendAction": "OVERWRITE_IF_EXISTS_OR_ADD",
-              "header": {
-                "key": "X-Frame-Options",
-                "value": "SAMEORIGIN"
-              }
-            },
-            {
-              "appendAction": "OVERWRITE_IF_EXISTS_OR_ADD",
-              "header": {
-                "key": "X-XSS-Protection",
-                "value": "1; mode=block"
-              }
-            }
-          ],
-          "routes": [
-            {
-              "match": {
-                "path": "/.pomerium/jwt"
-              },
-              "name": "pomerium-path-/.pomerium/jwt",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              }
-            },
-            {
-              "match": {
-                "path": "/.pomerium/webauthn"
-              },
-              "name": "pomerium-path-/.pomerium/webauthn",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              }
-            },
-            {
-              "match": {
-                "path": "/ping"
-              },
-              "name": "pomerium-path-/ping",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            },
-            {
-              "match": {
-                "path": "/healthz"
-              },
-              "name": "pomerium-path-/healthz",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            },
-            {
-              "match": {
-                "path": "/.pomerium"
-              },
-              "name": "pomerium-path-/.pomerium",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            },
-            {
-              "match": {
-                "prefix": "/.pomerium/"
-              },
-              "name": "pomerium-prefix-/.pomerium/",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            },
-            {
-              "match": {
-                "path": "/.well-known/pomerium"
-              },
-              "name": "pomerium-path-/.well-known/pomerium",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            },
-            {
-              "match": {
-                "prefix": "/.well-known/pomerium/"
-              },
-              "name": "pomerium-prefix-/.well-known/pomerium/",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            },
-            {
-              "match": {
-                "path": "/robots.txt"
-              },
-              "name": "pomerium-path-/robots.txt",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            },
-            {
-              "match": {
-                "path": "/oauth2/callback"
-              },
-              "name": "pomerium-path-/oauth2/callback",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            },
-            {
-              "match": {
-                "path": "/"
-              },
-              "name": "pomerium-path-/",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            }
-          ]
-        },
-        {
-          "domains": ["authenticate.example.com:443"],
-          "name": "authenticate.example.com:443",
-          "responseHeadersToAdd": [
-            {
-              "appendAction": "OVERWRITE_IF_EXISTS_OR_ADD",
-              "header": {
-                "key": "X-Frame-Options",
-                "value": "SAMEORIGIN"
-              }
-            },
-            {
-              "appendAction": "OVERWRITE_IF_EXISTS_OR_ADD",
-              "header": {
-                "key": "X-XSS-Protection",
-                "value": "1; mode=block"
-              }
-            }
-          ],
-          "routes": [
-            {
-              "match": {
-                "path": "/.pomerium/jwt"
-              },
-              "name": "pomerium-path-/.pomerium/jwt",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              }
-            },
-            {
-              "match": {
-                "path": "/.pomerium/webauthn"
-              },
-              "name": "pomerium-path-/.pomerium/webauthn",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              }
-            },
-            {
-              "match": {
-                "path": "/ping"
-              },
-              "name": "pomerium-path-/ping",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            },
-            {
-              "match": {
-                "path": "/healthz"
-              },
-              "name": "pomerium-path-/healthz",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            },
-            {
-              "match": {
-                "path": "/.pomerium"
-              },
-              "name": "pomerium-path-/.pomerium",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            },
-            {
-              "match": {
-                "prefix": "/.pomerium/"
-              },
-              "name": "pomerium-prefix-/.pomerium/",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            },
-            {
-              "match": {
-                "path": "/.well-known/pomerium"
-              },
-              "name": "pomerium-path-/.well-known/pomerium",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            },
-            {
-              "match": {
-                "prefix": "/.well-known/pomerium/"
-              },
-              "name": "pomerium-prefix-/.well-known/pomerium/",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            },
-            {
-              "match": {
-                "path": "/robots.txt"
-              },
-              "name": "pomerium-path-/robots.txt",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            },
-            {
-              "match": {
-                "path": "/oauth2/callback"
-              },
-              "name": "pomerium-path-/oauth2/callback",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            },
-            {
-              "match": {
-                "path": "/"
-              },
-              "name": "pomerium-path-/",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            }
-          ]
-        },
-        {
-          "domains": ["*"],
-          "name": "catch-all",
-          "responseHeadersToAdd": [
-            {
-              "appendAction": "OVERWRITE_IF_EXISTS_OR_ADD",
-              "header": {
-                "key": "X-Frame-Options",
-                "value": "SAMEORIGIN"
-              }
-            },
-            {
-              "appendAction": "OVERWRITE_IF_EXISTS_OR_ADD",
-              "header": {
-                "key": "X-XSS-Protection",
-                "value": "1; mode=block"
-              }
-            }
-          ],
-          "routes": [
-            {
-              "match": {
-                "path": "/.pomerium/jwt"
-              },
-              "name": "pomerium-path-/.pomerium/jwt",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              }
-            },
-            {
-              "match": {
-                "path": "/.pomerium/webauthn"
-              },
-              "name": "pomerium-path-/.pomerium/webauthn",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              }
-            },
-            {
-              "match": {
-                "path": "/ping"
-              },
-              "name": "pomerium-path-/ping",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            },
-            {
-              "match": {
-                "path": "/healthz"
-              },
-              "name": "pomerium-path-/healthz",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            },
-            {
-              "match": {
-                "path": "/.pomerium"
-              },
-              "name": "pomerium-path-/.pomerium",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            },
-            {
-              "match": {
-                "prefix": "/.pomerium/"
-              },
-              "name": "pomerium-prefix-/.pomerium/",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            },
-            {
-              "match": {
-                "path": "/.well-known/pomerium"
-              },
-              "name": "pomerium-path-/.well-known/pomerium",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            },
-            {
-              "match": {
-                "prefix": "/.well-known/pomerium/"
-              },
-              "name": "pomerium-prefix-/.well-known/pomerium/",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            },
-            {
-              "match": {
-                "path": "/robots.txt"
-              },
-              "name": "pomerium-path-/robots.txt",
-              "route": {
-                "cluster": "pomerium-control-plane-http"
-              },
-              "typedPerFilterConfig": {
-                "envoy.filters.http.ext_authz": {
-                  "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute",
-                  "disabled": true
-                }
-              }
-            }
-          ]
-        }
-      ]
+    "rds": {
+      "configSource": {
+        "ads": {},
+        "resourceApiVersion": "V3"
+      },
+      "routeConfigName": "main"
     },
     "skipXffAppend": true,
     "statPrefix": "ingress",