diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index a195d7b80cae8..50656e238e39a 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -189,7 +189,6 @@ def _python_deps():
         build_file = "@envoy//bazel/external:twitter_common_finagle_thrift.BUILD",
     )
 
-
 # Bazel native C++ dependencies. For the depedencies that doesn't provide autoconf/automake builds.
 def _cc_deps():
     _repository_impl("grpc_httpjson_transcoding")
diff --git a/configs/envoy_front_proxy_v2.template.yaml b/configs/envoy_front_proxy_v2.template.yaml
index c24e4f883662b..f72aa94e3084d 100644
--- a/configs/envoy_front_proxy_v2.template.yaml
+++ b/configs/envoy_front_proxy_v2.template.yaml
@@ -44,7 +44,9 @@
         - name: envoy.health_check
           config:
             pass_through_mode: false
-            endpoint: "/healthcheck"
+            headers:
+              - name: ":path"
+                exact_match: "/healthcheck"
         - name: envoy.buffer
           config:
             max_request_bytes: 5242880
@@ -153,4 +155,4 @@ admin:
     socket_address:
       protocol: TCP
       address: 0.0.0.0
-      port_value: 9901
\ No newline at end of file
+      port_value: 9901
diff --git a/configs/envoy_service_to_service_v2.template.yaml b/configs/envoy_service_to_service_v2.template.yaml
index e91f08d157a91..e6939aa681875 100644
--- a/configs/envoy_service_to_service_v2.template.yaml
+++ b/configs/envoy_service_to_service_v2.template.yaml
@@ -23,7 +23,7 @@
                 prefix: "/"
                 headers:
                 - name: content-type
-                  value: application/grpc
+                  exact_match: application/grpc
               route:
                 cluster: local_service_grpc
             - match:
@@ -34,7 +34,9 @@
         - name: envoy.health_check
           config:
            pass_through_mode: true
-           endpoint: "/healthcheck"
+           headers:
+             - name: ":path"
+               exact_match: "/healthcheck"
            cache_time: 2.5s
         - name: envoy.buffer
           config:
@@ -168,8 +170,9 @@ static_resources:
             config_source:
                api_config_source:
                  api_type: GRPC
-                 cluster_names:
-                 - rds
+                 grpc_services:
+                   envoy_grpc:
+                     cluster_name: "rds"
             route_config_name: rds_config_for_listener_1
           add_user_agent: true
           tracing:
@@ -430,7 +433,7 @@ static_resources:
           - collector-grpc.lightstep.com
   - name: cds_cluster
     connect_timeout: 0.25s
-    type: STRICT_DNS  
+    type: STRICT_DNS
     lb_policy: ROUND_ROBIN
     hosts:
     - socket_address:
@@ -479,4 +482,4 @@ admin:
     socket_address:
       protocol: TCP
       address: 0.0.0.0
-      port_value: 9901
\ No newline at end of file
+      port_value: 9901