diff --git a/demo/istio/bootstrap.sh b/demo/istio/bootstrap.sh
index d00494f9..bef33b2a 100755
--- a/demo/istio/bootstrap.sh
+++ b/demo/istio/bootstrap.sh
@@ -3,12 +3,31 @@
 KIND_IMAGE=kindest/node:v1.29.2
 ISTIO_REPO=https://istio-release.storage.googleapis.com/charts
 ISTIO_NS=istio-system
+ISTIO_INGRESS_NS=istio-ingress
 
 # Create Kind cluster
-kind create cluster --image $KIND_IMAGE
+kind create cluster --image $KIND_IMAGE --wait 1m --config - <<EOF
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+nodes:
+  - role: control-plane
+    kubeadmConfigPatches:
+      - |-
+        kind: InitConfiguration
+        nodeRegistration:
+          kubeletExtraArgs:
+            node-labels: "ingress-ready=true"
+    extraPortMappings:
+      - containerPort: 80
+        hostPort: 80
+        protocol: TCP
+      - containerPort: 443
+        hostPort: 443
+        protocol: TCP
+  - role: worker
+EOF
 
 # Install Istio components
-helm upgrade --install istio-base       --namespace $ISTIO_NS --create-namespace --wait --repo $ISTIO_REPO base
-helm upgrade --install istiod           --namespace $ISTIO_NS --create-namespace --wait --repo $ISTIO_REPO istiod
-helm upgrade --install istio-ingress    --namespace $ISTIO_NS --create-namespace --wait --repo $ISTIO_REPO gateway
-
+helm upgrade --install istio-base       --namespace $ISTIO_NS           --create-namespace --wait --repo $ISTIO_REPO base
+helm upgrade --install istiod           --namespace $ISTIO_NS           --create-namespace --wait --repo $ISTIO_REPO istiod
+helm upgrade --install istio-ingress    --namespace $ISTIO_INGRESS_NS   --create-namespace --wait --repo $ISTIO_REPO gateway
diff --git a/demo/istio/manifests/echo-service.yaml b/demo/istio/manifests/echo-service.yaml
index 78aa025a..c6956653 100644
--- a/demo/istio/manifests/echo-service.yaml
+++ b/demo/istio/manifests/echo-service.yaml
@@ -4,9 +4,7 @@ metadata:
   name: demo
   labels:
     istio-injection: enabled 
-
 ---
-
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -27,9 +25,7 @@ spec:
         image: mendhak/http-https-echo
         ports:
         - containerPort: 8080
-
 ---
-
 apiVersion: v1
 kind: Service
 metadata:
@@ -42,7 +38,6 @@ spec:
   ports:
   - port: 8080
     targetPort: 8080
-
 ---
 apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
@@ -74,4 +69,4 @@ spec:
       name: http
       protocol: HTTP
     hosts:
-    - "*" 
\ No newline at end of file
+    - "*"