diff --git a/demo/istio/bootstrap.sh b/demo/istio/bootstrap.sh
new file mode 100755
index 00000000..8dee3c54
--- /dev/null
+++ b/demo/istio/bootstrap.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+KIND_IMAGE=kindest/node:v1.29.2
+ISTIO_REPO=https://istio-release.storage.googleapis.com/charts
+ISTIO_NS=istio-system
+
+# Create Kind cluster
+kind create cluster --image $KIND_IMAGE
+
+# 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
+
+# Label default namespace to inject sidecar automatically
+kubectl label namespace default istio-injection=enabled
diff --git a/demo/istio/install-istio.sh b/demo/istio/install-istio.sh
deleted file mode 100755
index 6a1b2d14..00000000
--- a/demo/istio/install-istio.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# Create Kind cluster
-kind create cluster
-
-# Add Helm repo
-helm repo add istio https://istio-release.storage.googleapis.com/charts
-helm repo update
-
-# Create istio-system namespace
-kubectl create namespace istio-system
-
-# Install Istio components
-helm install istio-base istio/base -n istio-system
-helm install istiod istio/istiod -n istio-system --wait
-helm install istio-ingress istio/gateway -n istio-system
-
-# Label default namespace to inject sidecar automatically
-kubectl label namespace default istio-injection=enabled
\ No newline at end of file
diff --git a/demo/istio/echo-service.yaml b/demo/istio/manifests/echo-service.yaml
similarity index 100%
rename from demo/istio/echo-service.yaml
rename to demo/istio/manifests/echo-service.yaml