diff --git a/config/203-local-gateway.yaml b/config/203-local-gateway.yaml
index c2ee59da05..48eb86a4fd 100644
--- a/config/203-local-gateway.yaml
+++ b/config/203-local-gateway.yaml
@@ -17,25 +17,6 @@
 # do have a service mesh setup, this isn't required.
 apiVersion: networking.istio.io/v1alpha3
 kind: Gateway
-metadata:
-  name: cluster-local-gateway
-  namespace: knative-serving
-  labels:
-    serving.knative.dev/release: devel
-    networking.knative.dev/ingress-provider: istio
-spec:
-  selector:
-    istio: cluster-local-gateway
-  servers:
-  - port:
-      number: 80
-      name: http
-      protocol: HTTP
-    hosts:
-    - "*"
----
-apiVersion: networking.istio.io/v1alpha3
-kind: Gateway
 metadata:
   name: knative-local-gateway
   namespace: knative-serving
diff --git a/config/config.yaml b/config/config.yaml
index caa720ddad..735e044946 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -62,8 +62,8 @@ data:
     # {{local_gateway_namespace}} is optional; when it is omitted, the system
     # will search for the local gateway in the serving system namespace
     # `knative-serving`
-    local-gateway.knative-serving.cluster-local-gateway: "cluster-local-gateway.istio-system.svc.cluster.local"
+    local-gateway.knative-serving.knative-local-gateway: "knative-local-gateway.istio-system.svc.cluster.local"
 
-    # To use only Istio service mesh and no cluster-local-gateway, replace
+    # To use only Istio service mesh and no knative-local-gateway, replace
     # all local-gateway.* entries by the following entry.
     local-gateway.mesh: "mesh"
diff --git a/third_party/istio-latest/istio-ci-mesh.yaml b/third_party/istio-latest/istio-ci-mesh.yaml
index 10c2236522..1ed01659c4 100644
--- a/third_party/istio-latest/istio-ci-mesh.yaml
+++ b/third_party/istio-latest/istio-ci-mesh.yaml
@@ -58,27 +58,3 @@ spec:
             requests:
               cpu: 1000m
               memory: 1024Mi
-      - name: cluster-local-gateway
-        enabled: true
-        label:
-          istio: cluster-local-gateway
-          app: cluster-local-gateway
-        k8s:
-          resources:
-            limits:
-              cpu: 3000m
-              memory: 2048Mi
-            requests:
-              cpu: 1000m
-              memory: 1024Mi
-          service:
-            type: ClusterIP
-            ports:
-            - port: 15020
-              name: status-port
-            - port: 80
-              targetPort: 8080
-              name: http2
-            - port: 443
-              targetPort: 8443
-              name: https
\ No newline at end of file
diff --git a/third_party/istio-latest/istio-ci-no-mesh.yaml b/third_party/istio-latest/istio-ci-no-mesh.yaml
index fdb249edca..d8b8b2a37a 100644
--- a/third_party/istio-latest/istio-ci-no-mesh.yaml
+++ b/third_party/istio-latest/istio-ci-no-mesh.yaml
@@ -51,27 +51,3 @@ spec:
             requests:
               cpu: 1000m
               memory: 1024Mi
-      - name: cluster-local-gateway
-        enabled: true
-        label:
-          istio: cluster-local-gateway
-          app: cluster-local-gateway
-        k8s:
-          resources:
-            limits:
-              cpu: 3000m
-              memory: 2048Mi
-            requests:
-              cpu: 1000m
-              memory: 1024Mi
-          service:
-            type: ClusterIP
-            ports:
-            - port: 15020
-              name: status-port
-            - port: 80
-              targetPort: 8080
-              name: http2
-            - port: 443
-              targetPort: 8443
-              name: https
\ No newline at end of file
diff --git a/third_party/istio-latest/istio-kind-mesh.yaml b/third_party/istio-latest/istio-kind-mesh.yaml
index c162e07aee..25d2837ac7 100644
--- a/third_party/istio-latest/istio-kind-mesh.yaml
+++ b/third_party/istio-latest/istio-kind-mesh.yaml
@@ -57,24 +57,3 @@ spec:
             requests:
               cpu: 100m
               memory: 256Mi
-      - name: cluster-local-gateway
-        enabled: true
-        label:
-          istio: cluster-local-gateway
-          app: cluster-local-gateway
-        k8s:
-          resources:
-            requests:
-              cpu: 100m
-              memory: 256Mi
-          service:
-            type: ClusterIP
-            ports:
-            - port: 15020
-              name: status-port
-            - port: 80
-              targetPort: 8080
-              name: http2
-            - port: 443
-              targetPort: 8443
-              name: https
diff --git a/third_party/istio-latest/istio-kind-no-mesh.yaml b/third_party/istio-latest/istio-kind-no-mesh.yaml
index 2bca16ef0c..8341ca8b3c 100644
--- a/third_party/istio-latest/istio-kind-no-mesh.yaml
+++ b/third_party/istio-latest/istio-kind-no-mesh.yaml
@@ -50,24 +50,3 @@ spec:
             requests:
               cpu: 100m
               memory: 256Mi
-      - name: cluster-local-gateway
-        enabled: true
-        label:
-          istio: cluster-local-gateway
-          app: cluster-local-gateway
-        k8s:
-          resources:
-            requests:
-              cpu: 100m
-              memory: 256Mi
-          service:
-            type: ClusterIP
-            ports:
-            - port: 15020
-              name: status-port
-            - port: 80
-              targetPort: 8080
-              name: http2
-            - port: 443
-              targetPort: 8443
-              name: https
diff --git a/third_party/istio-latest/istio-minimal.yaml b/third_party/istio-latest/istio-minimal.yaml
index 5fa5c8cef6..7e3f6086ce 100644
--- a/third_party/istio-latest/istio-minimal.yaml
+++ b/third_party/istio-latest/istio-minimal.yaml
@@ -34,20 +34,3 @@ spec:
     ingressGateways:
       - name: istio-ingressgateway
         enabled: true
-      - name: cluster-local-gateway
-        enabled: true
-        label:
-          istio: cluster-local-gateway
-          app: cluster-local-gateway
-        k8s:
-          service:
-            type: ClusterIP
-            ports:
-            - port: 15020
-              name: status-port
-            - port: 80
-              targetPort: 8080
-              name: http2
-            - port: 443
-              targetPort: 8443
-              name: https
diff --git a/third_party/istio-stable/istio-ci-mesh.yaml b/third_party/istio-stable/istio-ci-mesh.yaml
index 10c2236522..1ed01659c4 100644
--- a/third_party/istio-stable/istio-ci-mesh.yaml
+++ b/third_party/istio-stable/istio-ci-mesh.yaml
@@ -58,27 +58,3 @@ spec:
             requests:
               cpu: 1000m
               memory: 1024Mi
-      - name: cluster-local-gateway
-        enabled: true
-        label:
-          istio: cluster-local-gateway
-          app: cluster-local-gateway
-        k8s:
-          resources:
-            limits:
-              cpu: 3000m
-              memory: 2048Mi
-            requests:
-              cpu: 1000m
-              memory: 1024Mi
-          service:
-            type: ClusterIP
-            ports:
-            - port: 15020
-              name: status-port
-            - port: 80
-              targetPort: 8080
-              name: http2
-            - port: 443
-              targetPort: 8443
-              name: https
\ No newline at end of file
diff --git a/third_party/istio-stable/istio-ci-no-mesh.yaml b/third_party/istio-stable/istio-ci-no-mesh.yaml
index fdb249edca..d8b8b2a37a 100644
--- a/third_party/istio-stable/istio-ci-no-mesh.yaml
+++ b/third_party/istio-stable/istio-ci-no-mesh.yaml
@@ -51,27 +51,3 @@ spec:
             requests:
               cpu: 1000m
               memory: 1024Mi
-      - name: cluster-local-gateway
-        enabled: true
-        label:
-          istio: cluster-local-gateway
-          app: cluster-local-gateway
-        k8s:
-          resources:
-            limits:
-              cpu: 3000m
-              memory: 2048Mi
-            requests:
-              cpu: 1000m
-              memory: 1024Mi
-          service:
-            type: ClusterIP
-            ports:
-            - port: 15020
-              name: status-port
-            - port: 80
-              targetPort: 8080
-              name: http2
-            - port: 443
-              targetPort: 8443
-              name: https
\ No newline at end of file
diff --git a/third_party/istio-stable/istio-kind-mesh.yaml b/third_party/istio-stable/istio-kind-mesh.yaml
index c162e07aee..25d2837ac7 100644
--- a/third_party/istio-stable/istio-kind-mesh.yaml
+++ b/third_party/istio-stable/istio-kind-mesh.yaml
@@ -57,24 +57,3 @@ spec:
             requests:
               cpu: 100m
               memory: 256Mi
-      - name: cluster-local-gateway
-        enabled: true
-        label:
-          istio: cluster-local-gateway
-          app: cluster-local-gateway
-        k8s:
-          resources:
-            requests:
-              cpu: 100m
-              memory: 256Mi
-          service:
-            type: ClusterIP
-            ports:
-            - port: 15020
-              name: status-port
-            - port: 80
-              targetPort: 8080
-              name: http2
-            - port: 443
-              targetPort: 8443
-              name: https
diff --git a/third_party/istio-stable/istio-kind-no-mesh.yaml b/third_party/istio-stable/istio-kind-no-mesh.yaml
index 2bca16ef0c..8341ca8b3c 100644
--- a/third_party/istio-stable/istio-kind-no-mesh.yaml
+++ b/third_party/istio-stable/istio-kind-no-mesh.yaml
@@ -50,24 +50,3 @@ spec:
             requests:
               cpu: 100m
               memory: 256Mi
-      - name: cluster-local-gateway
-        enabled: true
-        label:
-          istio: cluster-local-gateway
-          app: cluster-local-gateway
-        k8s:
-          resources:
-            requests:
-              cpu: 100m
-              memory: 256Mi
-          service:
-            type: ClusterIP
-            ports:
-            - port: 15020
-              name: status-port
-            - port: 80
-              targetPort: 8080
-              name: http2
-            - port: 443
-              targetPort: 8443
-              name: https
diff --git a/third_party/istio-stable/istio-minimal.yaml b/third_party/istio-stable/istio-minimal.yaml
index 5fa5c8cef6..7e3f6086ce 100644
--- a/third_party/istio-stable/istio-minimal.yaml
+++ b/third_party/istio-stable/istio-minimal.yaml
@@ -34,20 +34,3 @@ spec:
     ingressGateways:
       - name: istio-ingressgateway
         enabled: true
-      - name: cluster-local-gateway
-        enabled: true
-        label:
-          istio: cluster-local-gateway
-          app: cluster-local-gateway
-        k8s:
-          service:
-            type: ClusterIP
-            ports:
-            - port: 15020
-              name: status-port
-            - port: 80
-              targetPort: 8080
-              name: http2
-            - port: 443
-              targetPort: 8443
-              name: https