diff --git a/config/observability/prometheus/monitors/istio/service-monitor-istiod.yaml b/config/observability/prometheus/monitors/istio/service-monitor-istiod.yaml
index c4215fc39..e2af452b7 100644
--- a/config/observability/prometheus/monitors/istio/service-monitor-istiod.yaml
+++ b/config/observability/prometheus/monitors/istio/service-monitor-istiod.yaml
@@ -2,11 +2,11 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: istiod
-  namespace: gateway-system
+  namespace: istio-system
 spec:
   namespaceSelector:
     matchNames:
-    - gateway-system
+    - istio-system
   selector:
     matchLabels:
       app: istiod
diff --git a/hack/quickstart-setup.sh b/hack/quickstart-setup.sh
index ae936be97..cef963acd 100755
--- a/hack/quickstart-setup.sh
+++ b/hack/quickstart-setup.sh
@@ -61,6 +61,9 @@ fi
 
 if [ -z $ISTIO_INSTALL_SAIL ]; then
   ISTIO_INSTALL_SAIL=${ISTIO_INSTALL_SAIL:=true}
+fi
+
+if [ -z "$SAIL_VERSION" ] && [ "$ISTIO_INSTALL_SAIL" = "true" ]; then
   SAIL_VERSION=${SAIL_VERSION:="0.1.0"}
 fi
 
@@ -457,6 +460,11 @@ info "Deploying Kuadrant sample configuration..."
 kubectl -n ${KUADRANT_NAMESPACE} apply -f ${KUADRANT_REPO_RAW}/config/samples/kuadrant_v1beta1_kuadrant.yaml
 success "Kuadrant sample configuration deployed."
 
+# Deploy gateway
+info "Deploying example gateway ..."
+kustomize build config/dependencies/istio/gateway | kubectl apply -f -
+success "Kuadrant sample gateway deployed."
+
 # Install thanos on hub cluster
 if [ "$HUB" -eq 1 ]; then
   info "Installing thanos in ${KUADRANT_CLUSTER_NAME}... (as hub cluster)"