diff --git a/.github/workflows/kind-e2e.yaml b/.github/workflows/kind-e2e.yaml
index f1494bb99..6ba7e5043 100644
--- a/.github/workflows/kind-e2e.yaml
+++ b/.github/workflows/kind-e2e.yaml
@@ -25,9 +25,12 @@ jobs:
 
         gateway:
         - quay.io/maistra-dev/proxyv2-ubi8:2.4-latest
-        - docker.io/envoyproxy/envoy:v1.26-latest
-        - docker.io/envoyproxy/envoy:v1.27-latest
-        - docker.io/envoyproxy/envoy:v1.28-latest
+        - docker.io/envoyproxy/envoy:distroless-v1.26-latest
+        - docker.io/envoyproxy/envoy:distroless-v1.27-latest
+        - docker.io/envoyproxy/envoy:distroless-v1.28-latest
+        - docker.io/envoyproxy/envoy:distroless-v1.29-latest
+        - docker.io/envoyproxy/envoy:distroless-v1.30-latest
+        - docker.io/envoyproxy/envoy:distroless-v1.31-latest
 
         upstream-tls:
         - plain
diff --git a/config/300-gateway.yaml b/config/300-gateway.yaml
index b6882b10c..b3cf6ae9d 100644
--- a/config/300-gateway.yaml
+++ b/config/300-gateway.yaml
@@ -55,7 +55,7 @@ spec:
           env:
             - name: DRAIN_TIME_SECONDS
               value: "15"
-          image: docker.io/envoyproxy/envoy:v1.26-latest
+          image: docker.io/envoyproxy/envoy:distroless-v1.31-latest
           name: kourier-gateway
           ports:
             - name: http2-external