diff --git a/scripts/cluster/setup_master_node.sh b/scripts/cluster/setup_master_node.sh
index d7e0bc250..2c2b0dc33 100755
--- a/scripts/cluster/setup_master_node.sh
+++ b/scripts/cluster/setup_master_node.sh
@@ -43,9 +43,10 @@ kubectl apply -f $ROOT/configs/metallb/metallb-configmap.yaml
 
 # istio
 cd $ROOT
-curl -L https://istio.io/downloadIstio | ISTIO_VERSION=1.7.1 TARGET_ARCH=x86_64 sh -
-export PATH=$PATH:$ROOT/istio-1.7.1/bin
-sudo sh -c  "echo 'export PATH=\$PATH:$ROOT/istio-1.7.1/bin' >> /etc/profile"
+ISTIO_VERSION=1.7.1 # Make sure that Zipkin manifest is for the same major version (e.g., 1.7) of Istio
+curl -L https://istio.io/downloadIstio | ISTIO_VERSION=${ISTIO_VERSION} TARGET_ARCH=x86_64 sh -
+export PATH=$PATH:$ROOT/istio-${ISTIO_VERION}/bin
+sudo sh -c  "echo 'export PATH=\$PATH:$ROOT/istio-${ISTIO_VERSION}/bin' >> /etc/profile"
 istioctl install -f $ROOT/configs/istio/istio-minimal-operator.yaml
 
 KNATIVE_VERSION=v0.23.0
@@ -81,3 +82,5 @@ kubectl apply --filename https://github.com/knative/eventing/releases/download/$
 kubectl apply --filename https://github.com/knative/eventing/releases/download/$KNATIVE_VERSION/mt-channel-broker.yaml
 
 kubectl --namespace istio-system get service istio-ingressgateway
+sleep 2m
+kubectl label namespace default istio-injection=enabled
diff --git a/scripts/setup_zipkin.sh b/scripts/setup_zipkin.sh
index d677511e1..2658ae8ac 100755
--- a/scripts/setup_zipkin.sh
+++ b/scripts/setup_zipkin.sh
@@ -24,7 +24,7 @@
 
 set -e
 # install zipkin pods
-kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.9/samples/addons/extras/zipkin.yaml
+kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.7/samples/addons/extras/zipkin.yaml
 
 sleep 10s