diff --git a/adapter/internal/oasparser/envoyconf/routes_with_clusters.go b/adapter/internal/oasparser/envoyconf/routes_with_clusters.go
index fb5e5f4d3..0e4d98a9c 100644
--- a/adapter/internal/oasparser/envoyconf/routes_with_clusters.go
+++ b/adapter/internal/oasparser/envoyconf/routes_with_clusters.go
@@ -334,10 +334,13 @@ func CreateRateLimitCluster() (*clusterv3.Cluster, []*corev3.Address, error) {
 	upstreamTLSContext.CommonTlsContext.ValidationContextType = &tlsv3.CommonTlsContext_ValidationContext{
 		ValidationContext: &tlsv3.CertificateValidationContext{
 			TrustedCa: trustedCASrc,
-			MatchSubjectAltNames: []*envoy_type_matcherv3.StringMatcher{
+			MatchTypedSubjectAltNames: []*tlsv3.SubjectAltNameMatcher{
 				{
-					MatchPattern: &envoy_type_matcherv3.StringMatcher_Exact{
-						Exact: sslCertSanHostName,
+					SanType: tlsv3.SubjectAltNameMatcher_DNS,
+					Matcher: &envoy_type_matcherv3.StringMatcher{
+						MatchPattern: &envoy_type_matcherv3.StringMatcher_Exact{
+							Exact: sslCertSanHostName,
+						},
 					},
 				},
 			},
diff --git a/gateway/router/Dockerfile b/gateway/router/Dockerfile
index 8474379e2..325a98805 100644
--- a/gateway/router/Dockerfile
+++ b/gateway/router/Dockerfile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # -----------------------------------------------------------------------
-FROM envoyproxy/envoy:v1.27.1
+FROM envoyproxy/envoy:v1.29.1
 LABEL maintainer="WSO2 Docker Maintainers <wso2.com>"
 
 RUN apt-get update && apt-get upgrade -y && apt-get install -y curl
diff --git a/libs.versions.toml b/libs.versions.toml
index 9442017de..98a8315ee 100644
--- a/libs.versions.toml
+++ b/libs.versions.toml
@@ -130,7 +130,7 @@ commons-logging = "1.1.1"
 commons-pool = "1.5.6.wso2v1"
 commons-validator = "1.7"
 cxf = "3.5.4"
-envoyproxy = "1.0.39"
+envoyproxy = "1.0.42"
 fasterxml-woodstox="6.4.0"
 everit = "1.5.0.wso2.v2"
 geronimo = "1.1.1.wso2v1"
diff --git a/test/integration/README.md b/test/integration/README.md
index 859dc84db..3ed0ac774 100644
--- a/test/integration/README.md
+++ b/test/integration/README.md
@@ -37,7 +37,7 @@ If you have setup `Kind` and wish to run the integration tests using Gradle, the
 3. Port forward router-service to use localhost.
 
     ```bash
-    kubectl port-forward svc/apk-test-setup-wso2-apk-router-service -n apk-integration-test 9095:9095
+    kubectl port-forward svc/apk-test-setup-wso2-apk-gateway-service -n apk-integration-test 9095:9095
     ```
 
 4. Add all DNS mappings to `/etc/hosts` file. Refer to `scripts/run-tests.sh` file for the domain names.