diff --git a/net/grpc/gateway/docker/envoy/Dockerfile b/net/grpc/gateway/docker/envoy/Dockerfile
index 6b21ab0..3e5fe4a 100644
--- a/net/grpc/gateway/docker/envoy/Dockerfile
+++ b/net/grpc/gateway/docker/envoy/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM envoyproxy/envoy:v1.16.1
+FROM envoyproxy/envoy:v1.17.0
 
 COPY net/grpc/gateway/examples/echo/envoy.yaml /etc/envoy/envoy.yaml
 
diff --git a/net/grpc/gateway/examples/echo/envoy.yaml b/net/grpc/gateway/examples/echo/envoy.yaml
index 7cd4aeb..c2defa5 100644
--- a/net/grpc/gateway/examples/echo/envoy.yaml
+++ b/net/grpc/gateway/examples/echo/envoy.yaml
@@ -12,7 +12,7 @@ static_resources:
     - filters:
       - name: envoy.filters.network.http_connection_manager
         typed_config:
-          "@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
+          "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
           codec_type: auto
           stat_prefix: ingress_http
           route_config:
@@ -24,7 +24,8 @@ static_resources:
               - match: { prefix: "/" }
                 route:
                   cluster: echo_service
-                  max_grpc_timeout: 0s
+                  max_stream_duration:
+                    grpc_timeout_header_max: 0s
               cors:
                 allow_origin_string_match:
                 - prefix: "*"
@@ -50,4 +51,4 @@ static_resources:
                 address:
                   socket_address:
                     address: node-server
-                    port_value: 9090
\ No newline at end of file
+                    port_value: 9090
diff --git a/net/grpc/gateway/examples/helloworld/README.md b/net/grpc/gateway/examples/helloworld/README.md
index 87ab063..1b976ae 100644
--- a/net/grpc/gateway/examples/helloworld/README.md
+++ b/net/grpc/gateway/examples/helloworld/README.md
@@ -294,7 +294,7 @@ run the 3 processes all in the background.
 
  ```sh
  $ docker run -d -v "$(pwd)"/envoy.yaml:/etc/envoy/envoy.yaml:ro \
-     --network=host envoyproxy/envoy:v1.16.1
+     --network=host envoyproxy/envoy:v1.17.0
  ```
 
 > NOTE: As per [this issue](https://github.com/grpc/grpc-web/issues/436):
@@ -302,7 +302,7 @@ run the 3 processes all in the background.
 >
 > ```sh
 > $ docker run -d -v "$(pwd)"/envoy.yaml:/etc/envoy/envoy.yaml:ro \
->     -p 8080:8080 -p 9901:9901 envoyproxy/envoy:v1.16.1
+>     -p 8080:8080 -p 9901:9901 envoyproxy/envoy:v1.17.0
 >  ```
 
  3. Run the simple Web Server. This hosts the static file `index.html` and
diff --git a/net/grpc/gateway/examples/helloworld/envoy.yaml b/net/grpc/gateway/examples/helloworld/envoy.yaml
index ea40f21..daea5bf 100644
--- a/net/grpc/gateway/examples/helloworld/envoy.yaml
+++ b/net/grpc/gateway/examples/helloworld/envoy.yaml
@@ -12,7 +12,7 @@ static_resources:
     - filters:
       - name: envoy.filters.network.http_connection_manager
         typed_config:
-          "@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
+          "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
           codec_type: auto
           stat_prefix: ingress_http
           route_config:
@@ -24,7 +24,8 @@ static_resources:
               - match: { prefix: "/" }
                 route:
                   cluster: greeter_service
-                  max_grpc_timeout: 0s
+                  max_stream_duration:
+                    grpc_timeout_header_max: 0s
               cors:
                 allow_origin_string_match:
                 - prefix: "*"
@@ -51,4 +52,4 @@ static_resources:
                 address:
                   socket_address:
                     address: 0.0.0.0
-                    port_value: 9090
\ No newline at end of file
+                    port_value: 9090
diff --git a/scripts/run_interop_tests.sh b/scripts/run_interop_tests.sh
index a6e03d8..a879b3b 100755
--- a/scripts/run_interop_tests.sh
+++ b/scripts/run_interop_tests.sh
@@ -42,7 +42,7 @@ docker-compose build common prereqs node-interop-server interop-client java-inte
 # Run interop tests
 pid1=$(docker run -d \
   -v "$(pwd)"/test/interop/envoy.yaml:/etc/envoy/envoy.yaml:ro \
-  --network=host envoyproxy/envoy:v1.16.1)
+  --network=host envoyproxy/envoy:v1.17.0)
 pid2=$(docker run -d --network=host grpcweb/node-interop-server)
 
 run_tests
diff --git a/test/interop/README.md b/test/interop/README.md
index 2f83e87..7b9e403 100644
--- a/test/interop/README.md
+++ b/test/interop/README.md
@@ -33,7 +33,7 @@ tests.
 
 ```sh
 $ docker run -d -v $(pwd)/test/interop/envoy.yaml:/etc/envoy/envoy.yaml:ro \
-  --network=host envoyproxy/envoy:v1.16.1
+  --network=host envoyproxy/envoy:v1.17.0
 ```
 
 
diff --git a/test/interop/envoy.yaml b/test/interop/envoy.yaml
index 4b14a55..2bccf79 100644
--- a/test/interop/envoy.yaml
+++ b/test/interop/envoy.yaml
@@ -12,7 +12,7 @@ static_resources:
     - filters:
       - name: envoy.filters.network.http_connection_manager
         typed_config:
-          "@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
+          "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
           codec_type: auto
           stat_prefix: ingress_http
           route_config:
@@ -24,7 +24,8 @@ static_resources:
               - match: { prefix: "/" }
                 route:
                   cluster: interop_service
-                  max_grpc_timeout: 0s
+                  max_stream_duration:
+                    grpc_timeout_header_max: 0s
               cors:
                 allow_origin_string_match:
                 - prefix: "*"
@@ -50,4 +51,4 @@ static_resources:
                 address:
                   socket_address:
                     address: localhost
-                    port_value: 7074
\ No newline at end of file
+                    port_value: 7074