diff --git a/example/helm/destroy.argocd.sh b/example/helm/destroy.argocd.sh
index b226cb9b21..1b4a59f14c 100755
--- a/example/helm/destroy.argocd.sh
+++ b/example/helm/destroy.argocd.sh
@@ -10,6 +10,14 @@ kubectl -n argocd delete app profile-kubeflow-user-example-com
 # Kubeflow Instance #
 kubectl -n argocd delete app kubeflow
 
+# KServe #
+kubectl -n argocd delete app kserve
+kubectl -n argocd delete app kserve-crd
+
+# Knative #
+kubectl -n argocd delete app knative-operator
+kubectl -n argocd delete app knative-namespaces
+
 # Argo WF #
 kubectl -n argocd delete app argo-workflows
 
diff --git a/example/helm/destroy.helm.sh b/example/helm/destroy.helm.sh
index eb44225ea0..1bb60ba4f3 100755
--- a/example/helm/destroy.helm.sh
+++ b/example/helm/destroy.helm.sh
@@ -8,22 +8,31 @@ helm -n oauth2-proxy uninstall oauth2-proxy --wait=true
 kubectl delete profile kubeflow-user-example-com
 kubectl wait --for=delete namespace/kubeflow-user-example-com --timeout=120s
 
-# Kubeflow Instance #
+# Kubeflow #
 helm -n kubeflow uninstall kubeflow --wait
 
-# Argo WF #
+# KServe #
+helm -n kubeflow uninstall kserve
+helm -n kubeflow uninstall kserve-crd
+
+# Knative #
+helm -n knative uninstall knative-operator
+kubectl delete ns knative-serving
+kubectl delete ns knative-eventing
+
+# Argo Workflows #
 helm -n kubeflow uninstall argo-workflows --wait
 
 # Metacontroller #
 helm -n metacontroller uninstall metacontroller --wait
 
-# istio-ingressgateway #
+# Istio Ingress Gateway #
 helm -n istio-ingress uninstall istio-ingressgateway --wait
 
-# istiod #
+# Istio Discovery #
 helm -n istio-system uninstall istiod --wait
 
-# istio-base #
+# Istio Base #
 helm -n istio-system uninstall istio-base --wait
 
 # Dex #
diff --git a/example/helm/quickstart.argocd.sh b/example/helm/quickstart.argocd.sh
index f166706e02..8756b51ffd 100755
--- a/example/helm/quickstart.argocd.sh
+++ b/example/helm/quickstart.argocd.sh
@@ -27,18 +27,18 @@ else
 fi
 
 set -x
-kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.kubeflow-secrets.yaml
-kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.mysql.yaml
-kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.minio.yaml
-kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.cert-manager.yaml
-kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.dex.yaml
-kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.istio-base.yaml
-kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.istiod.yaml
-kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.metacontroller.yaml
-kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.knative-namespaces.yaml
-kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.knative-operator.yaml
-kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.kserve-crd.yaml
-kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.kserve.yaml
+kubectl apply -f "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.kubeflow-secrets.yaml"
+kubectl apply -f "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.mysql.yaml"
+kubectl apply -f "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.minio.yaml"
+kubectl apply -f "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.cert-manager.yaml"
+kubectl apply -f "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.dex.yaml"
+kubectl apply -f "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.istio-base.yaml"
+kubectl apply -f "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.istiod.yaml"
+kubectl apply -f "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.metacontroller.yaml"
+kubectl apply -f "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.knative-namespaces.yaml"
+kubectl apply -f "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.knative-operator.yaml"
+kubectl apply -f "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.kserve-crd.yaml"
+kubectl apply -f "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.kserve.yaml"
 set +x
 
 # Wait until pods are created. This is not required since ArgoCD will be
@@ -48,9 +48,9 @@ sleep 30
 kubectl wait pods --all -n kubeflow --for=condition=Ready --timeout 300s
 
 set -x
-kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.argo-workflows.yaml
-kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.istio-ingressgateway.yaml
-kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.kubeflow.yaml
+kubectl apply -f "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.argo-workflows.yaml"
+kubectl apply -f "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.istio-ingressgateway.yaml"
+kubectl apply -f "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.kubeflow.yaml"
 set +x
 
 # Wait until pods are created. This is not required since ArgoCD will be
@@ -60,7 +60,7 @@ sleep 30
 kubectl wait pods --all --namespace kubeflow --for=condition=Ready --timeout 300s
 
 set -x
-kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.profile-kubeflow-user-example-com.yaml
+kubectl apply -f "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.profile-kubeflow-user-example-com.yaml"
 set +x
 
 # When deployed with in-cluster self-signed OIDC Issuer (kind, vcluster,
@@ -68,7 +68,7 @@ set +x
 # Discovery endpoint from anonymous user. This is condifured by kubeflow helm
 # chart.
 set -x
-kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.oauth2-proxy.yaml
+kubectl apply -f "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.oauth2-proxy.yaml"
 set +x
 
 # Wait until pods are created. This is not required since ArgoCD will be
diff --git a/example/helm/quickstart.helm.eks.sh b/example/helm/quickstart.helm.eks.sh
index a66493f747..3ff71732a9 100755
--- a/example/helm/quickstart.helm.eks.sh
+++ b/example/helm/quickstart.helm.eks.sh
@@ -1,19 +1,12 @@
 #!/bin/bash
 set -e
 
-KUBEFLOW_QUICKSTART_TMP_DIR="${KUBEFLOW_QUICKSTART_TMP_DIR:-/tmp/kubeflow.quickstart.cache}"
+KNATIVE_OPERATOR_VERSION="${KNATIVE_OPERATOR_VERSION:-1.11.12}"
+KNATIVE_OPERATOR_HELM_CHART_ARCHIVE_URL="${KNATIVE_OPERATOR_HELM_CHART_ARCHIVE_URL:-https://github.com/knative/operator/releases/download/knative-v${KNATIVE_OPERATOR_VERSION}/knative-operator-${KNATIVE_OPERATOR_VERSION}.tgz}"
 
 KSERVE_VERSION="${KSERVE_VERSION:-v0.11.2}"
-
 KSERVE_HELM_CHART_ARCHIVE_URL="${KSERVE_HELM_CHART_ARCHIVE_URL:-https://github.com/kserve/kserve/releases/download/${KSERVE_VERSION}/helm-chart-kserve-${KSERVE_VERSION}.tgz}"
-KSERVE_HELM_CHART_TGZ_PATH="${KUBEFLOW_QUICKSTART_TMP_DIR}/kserve.${KSERVE_VERSION}.tgz"
-KSERVE_HELM_CHART_PATH="${KUBEFLOW_QUICKSTART_TMP_DIR}/kserve.${KSERVE_VERSION}"
-
 KSERVE_CRD_HELM_CHART_ARCHIVE_URL="${KSERVE_CRD_HELM_CHART_ARCHIVE_URL:-https://github.com/kserve/kserve/releases/download/${KSERVE_VERSION}/helm-chart-kserve-crd-${KSERVE_VERSION}.tgz}"
-KSERVE_CRD_HELM_CHART_TGZ_PATH="${KUBEFLOW_QUICKSTART_TMP_DIR}/kserve-crd.${KSERVE_VERSION}.tgz"
-KSERVE_CRD_HELM_CHART_PATH="${KUBEFLOW_QUICKSTART_TMP_DIR}/kserve-crd.${KSERVE_VERSION}"
-
-mkdir -p "${KUBEFLOW_QUICKSTART_TMP_DIR}"
 
 cat <<EOF
 WARNING: This script is for reference only and will not work out of the box.
@@ -45,8 +38,9 @@ Press 'Ctrl'+'C' to cancel.
 Waiting 10 seconds...
 EOF
 sleep 10
-
 set -x
+
+# Kubeflow Namespace #
 kubectl apply -f - <<EOF
 apiVersion: v1
 kind: Namespace
@@ -56,9 +50,6 @@ metadata:
   name: kubeflow
 EOF
 
-kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/namespace.knative-serving.yaml
-kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/namespace.knative-eventing.yaml
-
 # Create secret with database credentials for KFP and MySQL
 export DB_CONFIG_SECRET_NAME=db-credentials
 kubectl apply -f "secret.${DB_CONFIG_SECRET_NAME}.yaml"
@@ -67,6 +58,7 @@ kubectl apply -f "secret.${DB_CONFIG_SECRET_NAME}.yaml"
 export OBJECTSTORE_CONFIG_SECRET_NAME=mlpipeline-minio-artifact
 kubectl apply -f "secret.${OBJECTSTORE_CONFIG_SECRET_NAME}.yaml"
 
+# MySQL #
 helm upgrade --install mysql mysql \
     --namespace kubeflow \
     --repo https://charts.bitnami.com/bitnami \
@@ -74,6 +66,7 @@ helm upgrade --install mysql mysql \
     --values values.mysql.yaml \
     --wait
 
+# MinIO #
 helm upgrade --install minio minio \
     --namespace kubeflow \
     --repo https://charts.bitnami.com/bitnami \
@@ -81,6 +74,7 @@ helm upgrade --install minio minio \
     --values values.minio.yaml \
     --wait
 
+# cert-manager #
 helm upgrade --install cert-manager cert-manager \
     --namespace cert-manager \
     --create-namespace \
@@ -89,6 +83,7 @@ helm upgrade --install cert-manager cert-manager \
     --values values.cert-manager.yaml \
     --wait
 
+# Dex #
 helm upgrade --install dex dex \
     --namespace dex \
     --create-namespace \
@@ -97,6 +92,7 @@ helm upgrade --install dex dex \
     --values values.dex.yaml \
     --wait
 
+# Istio Base #
 helm upgrade --install istio-base base \
     --namespace istio-system \
     --create-namespace \
@@ -104,6 +100,7 @@ helm upgrade --install istio-base base \
     --version 1.20.2 \
     --wait
 
+# Istio Discovery #
 helm upgrade --install istiod istiod \
     --namespace istio-system \
     --repo https://istio-release.storage.googleapis.com/charts \
@@ -111,6 +108,7 @@ helm upgrade --install istiod istiod \
     --values values.istiod.yaml \
     --wait
 
+# Istio Ingress Gateway #
 helm upgrade --install istio-ingressgateway gateway \
     --namespace istio-ingress \
     --create-namespace \
@@ -119,6 +117,7 @@ helm upgrade --install istio-ingressgateway gateway \
     --values values.istio-ingressgateway.yaml \
     --wait
 
+# Metacontroller #
 helm upgrade --install metacontroller oci://ghcr.io/metacontroller/metacontroller-helm \
     --namespace metacontroller \
     --create-namespace \
@@ -126,6 +125,7 @@ helm upgrade --install metacontroller oci://ghcr.io/metacontroller/metacontrolle
     --values values.metacontroller.yaml \
     --wait
 
+# Argo Workflows #
 helm upgrade --install argo-workflows argo-workflows \
     --namespace kubeflow \
     --repo https://argoproj.github.io/argo-helm \
@@ -134,71 +134,40 @@ helm upgrade --install argo-workflows argo-workflows \
     --wait
 
 
-# KNative Operator installation. 
-# Using the latest v1.13.0 operator version, results in a compatibility error 
-# with underlying Kubernetes installation: "minKubernetesVersion >= 1.26"
-kubectl apply -f \
-    https://github.com/knative/operator/releases/download/knative-v1.11.0/operator.yaml
-
-# Download kserve-crd Helm Chart from GitHub Release.
-# kserve-crd is available at Helm Chart Repository only from version v0.12.0.
-# https://github.com/kserve/kserve/pkgs/container/charts%2Fkserve-crd
-if [ ! -e "${KSERVE_CRD_HELM_CHART_TGZ_PATH}" ]; then
-    wget \
-        --no-clobber \
-        "${KSERVE_CRD_HELM_CHART_ARCHIVE_URL}" \
-        -O "${KSERVE_CRD_HELM_CHART_TGZ_PATH}"
-fi
-if [ ! -e "${KSERVE_CRD_HELM_CHART_PATH}" ]; then
-    mkdir -p "${KSERVE_CRD_HELM_CHART_PATH}"
-    tar \
-        -xf "${KSERVE_CRD_HELM_CHART_TGZ_PATH}" \
-        -C "${KSERVE_CRD_HELM_CHART_PATH}" \
-        --strip-components=1
-fi
-
-# Download kserve Helm Chart from GitHub Release.
-# kserve is available at Helm Chart Repository only from version v0.12.0.
-# https://github.com/kserve/kserve/pkgs/container/charts%2Fkserve
-if [ ! -e "${KSERVE_HELM_CHART_TGZ_PATH}" ]; then
-    wget \
-        --no-clobber \
-        "${KSERVE_HELM_CHART_ARCHIVE_URL}" \
-        -O "${KSERVE_HELM_CHART_TGZ_PATH}"
-fi
-if [ ! -e "${KSERVE_HELM_CHART_PATH}" ]; then
-    mkdir -p "${KSERVE_HELM_CHART_PATH}"
-    tar \
-        -xf "${KSERVE_HELM_CHART_TGZ_PATH}" \
-        -C "${KSERVE_HELM_CHART_PATH}" \
-        --strip-components=1
-fi
-
-helm upgrade --install kserve-crd "${KSERVE_CRD_HELM_CHART_PATH}" \
-    --namespace kserve \
+# KNative Operator #
+kubectl apply -f namespace.knative-serving.yaml
+kubectl apply -f namespace.knative-eventing.yaml
+helm upgrade --install knative-operator "${KNATIVE_OPERATOR_HELM_CHART_ARCHIVE_URL}" \
+    --namespace knative \
     --create-namespace \
     --wait
 
-helm upgrade --install kserve "${KSERVE_HELM_CHART_PATH}" \
-    --namespace kserve \
+# KServe CRDs #
+helm upgrade --install kserve-crd "${KSERVE_CRD_HELM_CHART_ARCHIVE_URL}" \
+    --namespace kubeflow \
     --create-namespace \
-    --values values.kserve.yaml \
     --wait
 
-# TODO:  # NOTE(romanok1): is this still valid?
-# - add remaining knative/kserve integrations (AuthorizationPolicies, any user-profile annotations etc)
+# KServe #
+helm upgrade --install kserve "${KSERVE_HELM_CHART_ARCHIVE_URL}" \
+    --namespace kubeflow \
+    --create-namespace \
+    --values values.kserve.yaml \
+    --wait
 
-# Kubeflow fatchart
+# Kubeflow #
 helm upgrade --install kubeflow ../../charts/kubeflow \
     --namespace kubeflow \
     --values values.kubeflow.eks.yaml \
     --wait
 
+# Kubeflow Profile #
 # Create kubeflow-user-example-com profile for tests.
 # Default password for user user@example.com:
 # 12341234
 kubectl apply -f profile.kubeflow-user-example-com.yaml
 
+# oauth2-proxy #
 # When k8s is deployed with in-cluster self-signed OIDC Issuer (kind, vcluster,
 # minikube and so on), oauth2-proxy has to wait for CRB allowing access to OIDC
 # Discovery endpoint from anonymous user. This CRB is deployed by kubeflow helm
diff --git a/example/helm/quickstart.helm.local.sh b/example/helm/quickstart.helm.local.sh
index 1a048ba243..44f90e33ac 100755
--- a/example/helm/quickstart.helm.local.sh
+++ b/example/helm/quickstart.helm.local.sh
@@ -1,19 +1,12 @@
 #!/bin/bash
 set -e
 
-KUBEFLOW_QUICKSTART_TMP_DIR="${KUBEFLOW_QUICKSTART_TMP_DIR:-/tmp/kubeflow.quickstart.cache}"
+KNATIVE_OPERATOR_VERSION="${KNATIVE_OPERATOR_VERSION:-1.11.12}"
+KNATIVE_OPERATOR_HELM_CHART_ARCHIVE_URL="${KNATIVE_OPERATOR_HELM_CHART_ARCHIVE_URL:-https://github.com/knative/operator/releases/download/knative-v${KNATIVE_OPERATOR_VERSION}/knative-operator-${KNATIVE_OPERATOR_VERSION}.tgz}"
 
-KSERVE_VERSION="${KSERVE_VERSION:-v0.11.2}"
-
-KSERVE_HELM_CHART_ARCHIVE_URL="${KSERVE_HELM_CHART_ARCHIVE_URL:-https://github.com/kserve/kserve/releases/download/${KSERVE_VERSION}/helm-chart-kserve-${KSERVE_VERSION}.tgz}"
-KSERVE_HELM_CHART_TGZ_PATH="${KUBEFLOW_QUICKSTART_TMP_DIR}/kserve.${KSERVE_VERSION}.tgz"
-KSERVE_HELM_CHART_PATH="${KUBEFLOW_QUICKSTART_TMP_DIR}/kserve.${KSERVE_VERSION}"
-
-KSERVE_CRD_HELM_CHART_ARCHIVE_URL="${KSERVE_CRD_HELM_CHART_ARCHIVE_URL:-https://github.com/kserve/kserve/releases/download/${KSERVE_VERSION}/helm-chart-kserve-crd-${KSERVE_VERSION}.tgz}"
-KSERVE_CRD_HELM_CHART_TGZ_PATH="${KUBEFLOW_QUICKSTART_TMP_DIR}/kserve-crd.${KSERVE_VERSION}.tgz"
-KSERVE_CRD_HELM_CHART_PATH="${KUBEFLOW_QUICKSTART_TMP_DIR}/kserve-crd.${KSERVE_VERSION}"
-
-mkdir -p "${KUBEFLOW_QUICKSTART_TMP_DIR}"
+KSERVE_VERSION="${KSERVE_VERSION:-0.11.2}"
+KSERVE_HELM_CHART_ARCHIVE_URL="${KSERVE_HELM_CHART_ARCHIVE_URL:-https://github.com/kserve/kserve/releases/download/v${KSERVE_VERSION}/helm-chart-kserve-v${KSERVE_VERSION}.tgz}"
+KSERVE_CRD_HELM_CHART_ARCHIVE_URL="${KSERVE_CRD_HELM_CHART_ARCHIVE_URL:-https://github.com/kserve/kserve/releases/download/v${KSERVE_VERSION}/helm-chart-kserve-crd-v${KSERVE_VERSION}.tgz}"
 
 cat <<EOF
 This script will create 'kubeflow' namespace configured with istio injection and
@@ -28,7 +21,7 @@ EOF
 sleep 10
 set -x
 
-# Create namespaces
+# Kubeflow Namespace #
 kubectl apply -f - <<EOF
 apiVersion: v1
 kind: Namespace
@@ -38,9 +31,6 @@ metadata:
   name: kubeflow
 EOF
 
-kubectl apply -f namespace.knative-serving.yaml
-kubectl apply -f namespace.knative-eventing.yaml
-
 # Create secret with database credentials for KFP and MySQL
 export DB_CONFIG_SECRET_NAME=db-credentials
 kubectl apply -f "secret.${DB_CONFIG_SECRET_NAME}.yaml"
@@ -49,6 +39,7 @@ kubectl apply -f "secret.${DB_CONFIG_SECRET_NAME}.yaml"
 export OBJECTSTORE_CONFIG_SECRET_NAME=mlpipeline-minio-artifact
 kubectl apply -f "secret.${OBJECTSTORE_CONFIG_SECRET_NAME}.yaml"
 
+# MySQL #
 helm upgrade --install mysql mysql \
     --namespace kubeflow \
     --repo https://charts.bitnami.com/bitnami \
@@ -56,6 +47,7 @@ helm upgrade --install mysql mysql \
     --values values.mysql.yaml \
     --wait
 
+# MinIO #
 helm upgrade --install minio minio \
     --namespace kubeflow \
     --repo https://charts.bitnami.com/bitnami \
@@ -63,6 +55,7 @@ helm upgrade --install minio minio \
     --values values.minio.yaml \
     --wait
 
+# cert-manager #
 helm upgrade --install cert-manager cert-manager \
     --namespace cert-manager \
     --create-namespace \
@@ -71,6 +64,7 @@ helm upgrade --install cert-manager cert-manager \
     --values values.cert-manager.yaml \
     --wait
 
+# Dex #
 helm upgrade --install dex dex \
     --namespace dex \
     --create-namespace \
@@ -79,6 +73,7 @@ helm upgrade --install dex dex \
     --values values.dex.yaml \
     --wait
 
+# Istio Base #
 helm upgrade --install istio-base base \
     --namespace istio-system \
     --create-namespace \
@@ -86,6 +81,7 @@ helm upgrade --install istio-base base \
     --version 1.20.2 \
     --wait
 
+# Istio Discovery #
 helm upgrade --install istiod istiod \
     --namespace istio-system \
     --repo https://istio-release.storage.googleapis.com/charts \
@@ -93,6 +89,7 @@ helm upgrade --install istiod istiod \
     --values values.istiod.yaml \
     --wait
 
+# Istio Ingress Gateway #
 helm upgrade --install istio-ingressgateway gateway \
     --namespace istio-ingress \
     --create-namespace \
@@ -101,6 +98,7 @@ helm upgrade --install istio-ingressgateway gateway \
     --values values.istio-ingressgateway.yaml \
     --wait
 
+# Metacontroller #
 helm upgrade --install metacontroller oci://ghcr.io/metacontroller/metacontroller-helm \
     --namespace metacontroller \
     --create-namespace \
@@ -108,6 +106,7 @@ helm upgrade --install metacontroller oci://ghcr.io/metacontroller/metacontrolle
     --values values.metacontroller.yaml \
     --wait
 
+# Argo Workflows #
 helm upgrade --install argo-workflows argo-workflows \
     --namespace kubeflow \
     --repo https://argoproj.github.io/argo-helm \
@@ -115,68 +114,41 @@ helm upgrade --install argo-workflows argo-workflows \
     --values values.argo-workflows.yaml \
     --wait
 
-# KNative Operator installation.
-# Using the latest v1.13.0 operator version, results in a compatibility error
-# with underlying Kubernetes installation: "minKubernetesVersion >= 1.26"
-kubectl apply -f \
-    https://github.com/knative/operator/releases/download/knative-v1.11.0/operator.yaml
-
-# Download kserve-crd Helm Chart from GitHub Release.
-# kserve-crd is available at Helm Chart Repository only from version v0.12.0.
-# https://github.com/kserve/kserve/pkgs/container/charts%2Fkserve-crd
-if [ ! -e "${KSERVE_CRD_HELM_CHART_TGZ_PATH}" ]; then
-    wget \
-        --no-clobber \
-        "${KSERVE_CRD_HELM_CHART_ARCHIVE_URL}" \
-        -O "${KSERVE_CRD_HELM_CHART_TGZ_PATH}"
-fi
-if [ ! -e "${KSERVE_CRD_HELM_CHART_PATH}" ]; then
-    mkdir -p "${KSERVE_CRD_HELM_CHART_PATH}"
-    tar \
-        -xf "${KSERVE_CRD_HELM_CHART_TGZ_PATH}" \
-        -C "${KSERVE_CRD_HELM_CHART_PATH}" \
-        --strip-components=1
-fi
-
-# Download kserve Helm Chart from GitHub Release.
-# kserve is available at Helm Chart Repository only from version v0.12.0.
-# https://github.com/kserve/kserve/pkgs/container/charts%2Fkserve
-if [ ! -e "${KSERVE_HELM_CHART_TGZ_PATH}" ]; then
-    wget \
-        --no-clobber \
-        "${KSERVE_HELM_CHART_ARCHIVE_URL}" \
-        -O "${KSERVE_HELM_CHART_TGZ_PATH}"
-fi
-if [ ! -e "${KSERVE_HELM_CHART_PATH}" ]; then
-    mkdir -p "${KSERVE_HELM_CHART_PATH}"
-    tar \
-        -xf "${KSERVE_HELM_CHART_TGZ_PATH}" \
-        -C "${KSERVE_HELM_CHART_PATH}" \
-        --strip-components=1
-fi
-
-helm upgrade --install kserve-crd "${KSERVE_CRD_HELM_CHART_PATH}" \
-    --namespace kserve \
+# KNative Operator #
+kubectl apply -f namespace.knative-serving.yaml
+kubectl apply -f namespace.knative-eventing.yaml
+helm upgrade --install knative-operator "${KNATIVE_OPERATOR_HELM_CHART_ARCHIVE_URL}" \
+    --namespace knative \
+    --create-namespace \
+    --wait
+
+# KServe CRDs #
+helm upgrade --install kserve-crd "${KSERVE_CRD_HELM_CHART_ARCHIVE_URL}" \
+    --namespace kubeflow \
     --create-namespace \
     --wait
 
-helm upgrade --install kserve "${KSERVE_HELM_CHART_PATH}" \
-    --namespace kserve \
+# KServe #
+helm upgrade --install kserve "${KSERVE_HELM_CHART_ARCHIVE_URL}" \
+    --namespace kubeflow \
     --create-namespace \
     --values values.kserve.yaml \
     --wait
 
+# Kubeflow #
 helm upgrade --install kubeflow \
     --namespace kubeflow \
     ../../charts/kubeflow \
     --values values.kubeflow.yaml \
     --wait
 
+# Kubeflow Profile #
 # Create kubeflow-user-example-com profile for tests.
 # Default password for user user@example.com:
 # 12341234
 kubectl apply -f profile.kubeflow-user-example-com.yaml
 
+# oauth2-proxy #
 # When k8s is deployed with in-cluster self-signed OIDC Issuer (kind, vcluster,
 # minikube and so on), oauth2-proxy has to wait for CRB allowing access to OIDC
 # Discovery endpoint from anonymous user. This CRB is deployed by kubeflow helm
diff --git a/example/helm/quickstart.helm.sh b/example/helm/quickstart.helm.sh
index 02daf7de83..be20d43943 100755
--- a/example/helm/quickstart.helm.sh
+++ b/example/helm/quickstart.helm.sh
@@ -3,19 +3,12 @@ set -e
 
 TARGET_REVISION="${TARGET_REVISION:-helmcharts}"
 
-KUBEFLOW_QUICKSTART_TMP_DIR="${KUBEFLOW_QUICKSTART_TMP_DIR:-/tmp/kubeflow.quickstart.cache}"
+KNATIVE_OPERATOR_VERSION="${KNATIVE_OPERATOR_VERSION:-1.11.12}"
+KNATIVE_OPERATOR_HELM_CHART_ARCHIVE_URL="${KNATIVE_OPERATOR_HELM_CHART_ARCHIVE_URL:-https://github.com/knative/operator/releases/download/knative-v${KNATIVE_OPERATOR_VERSION}/knative-operator-${KNATIVE_OPERATOR_VERSION}.tgz}"
 
 KSERVE_VERSION="${KSERVE_VERSION:-v0.11.2}"
-
 KSERVE_HELM_CHART_ARCHIVE_URL="${KSERVE_HELM_CHART_ARCHIVE_URL:-https://github.com/kserve/kserve/releases/download/${KSERVE_VERSION}/helm-chart-kserve-${KSERVE_VERSION}.tgz}"
-KSERVE_HELM_CHART_TGZ_PATH="${KUBEFLOW_QUICKSTART_TMP_DIR}/kserve.${KSERVE_VERSION}.tgz"
-KSERVE_HELM_CHART_PATH="${KUBEFLOW_QUICKSTART_TMP_DIR}/kserve.${KSERVE_VERSION}"
-
 KSERVE_CRD_HELM_CHART_ARCHIVE_URL="${KSERVE_CRD_HELM_CHART_ARCHIVE_URL:-https://github.com/kserve/kserve/releases/download/${KSERVE_VERSION}/helm-chart-kserve-crd-${KSERVE_VERSION}.tgz}"
-KSERVE_CRD_HELM_CHART_TGZ_PATH="${KUBEFLOW_QUICKSTART_TMP_DIR}/kserve-crd.${KSERVE_VERSION}.tgz"
-KSERVE_CRD_HELM_CHART_PATH="${KUBEFLOW_QUICKSTART_TMP_DIR}/kserve-crd.${KSERVE_VERSION}"
-
-mkdir -p "${KUBEFLOW_QUICKSTART_TMP_DIR}"
 
 cat <<EOF
 This script will create 'kubeflow' namespace configured with istio injection and
@@ -30,7 +23,7 @@ EOF
 sleep 10
 set -x
 
-# Create namespaces
+# Kubeflow Namespace #
 kubectl apply -f - <<EOF
 apiVersion: v1
 kind: Namespace
@@ -40,9 +33,6 @@ metadata:
   name: kubeflow
 EOF
 
-kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/namespace.knative-serving.yaml
-kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/namespace.knative-eventing.yaml
-
 # Create secret with database credentials for KFP and MySQL
 export DB_CONFIG_SECRET_NAME=db-credentials
 kubectl apply -f "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/secret.${DB_CONFIG_SECRET_NAME}.yaml"
@@ -51,36 +41,41 @@ kubectl apply -f "https://raw.githubusercontent.com/kromanow94/kubeflow-manifest
 export OBJECTSTORE_CONFIG_SECRET_NAME=mlpipeline-minio-artifact
 kubectl apply -f "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/secret.${OBJECTSTORE_CONFIG_SECRET_NAME}.yaml"
 
+# MySQL #
 helm upgrade --install mysql mysql \
     --namespace kubeflow \
     --repo https://charts.bitnami.com/bitnami \
     --version 9.21.2 \
-    --values https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/values.mysql.yaml \
+    --values "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/values.mysql.yaml" \
     --wait
 
+# MinIO #
 helm upgrade --install minio minio \
     --namespace kubeflow \
     --repo https://charts.bitnami.com/bitnami \
     --version 13.7.0 \
-    --values https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/values.minio.yaml \
+    --values "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/values.minio.yaml" \
     --wait
 
+# cert-manager #
 helm upgrade --install cert-manager cert-manager \
     --namespace cert-manager \
     --create-namespace \
     --repo https://charts.jetstack.io \
     --version v1.14.3 \
-    --values https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/values.cert-manager.yaml \
+    --values "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/values.cert-manager.yaml" \
     --wait
 
+# Dex #
 helm upgrade --install dex dex \
     --namespace dex \
     --create-namespace \
     --repo https://charts.dexidp.io \
     --version 0.16.0 \
-    --values https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/values.dex.yaml \
+    --values "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/values.dex.yaml" \
     --wait
 
+# Istio Base #
 helm upgrade --install istio-base base \
     --namespace istio-system \
     --create-namespace \
@@ -88,102 +83,74 @@ helm upgrade --install istio-base base \
     --version 1.20.2 \
     --wait
 
+# Istio Discovery #
 helm upgrade --install istiod istiod \
     --namespace istio-system \
     --repo https://istio-release.storage.googleapis.com/charts \
     --version 1.20.2 \
-    --values https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/values.istiod.yaml \
+    --values "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/values.istiod.yaml" \
     --wait
 
+# Istio Ingress Gateway #
 helm upgrade --install istio-ingressgateway gateway \
     --namespace istio-ingress \
     --create-namespace \
     --repo https://istio-release.storage.googleapis.com/charts \
     --version 1.20.2 \
-    --values https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/values.istio-ingressgateway.yaml \
+    --values "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/values.istio-ingressgateway.yaml" \
     --wait
 
+# Metacontroller #
 helm upgrade --install metacontroller oci://ghcr.io/metacontroller/metacontroller-helm \
     --namespace metacontroller \
     --create-namespace \
     --version v2.6.1 \
-    --values https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/values.metacontroller.yaml \
+    --values "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/values.metacontroller.yaml" \
     --wait
 
+# Argo Workflows #
 helm upgrade --install argo-workflows argo-workflows \
     --namespace kubeflow \
     --repo https://argoproj.github.io/argo-helm \
     --version 0.17.1 \
-    --values https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/values.argo-workflows.yaml \
+    --values "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/values.argo-workflows.yaml" \
     --wait
 
-# KNative Operator installation. 
-# Using the latest v1.13.0 operator version, results in a compatibility error 
-# with underlying Kubernetes installation: "minKubernetesVersion >= 1.26"
-kubectl apply -f \
-    https://github.com/knative/operator/releases/download/knative-v1.11.0/operator.yaml
-
-# Download kserve-crd Helm Chart from GitHub Release.
-# kserve-crd is available at Helm Chart Repository only from version v0.12.0.
-# https://github.com/kserve/kserve/pkgs/container/charts%2Fkserve-crd
-if [ ! -e "${KSERVE_CRD_HELM_CHART_TGZ_PATH}" ]; then
-    wget \
-        --no-clobber \
-        "${KSERVE_CRD_HELM_CHART_ARCHIVE_URL}" \
-        -O "${KSERVE_CRD_HELM_CHART_TGZ_PATH}"
-fi
-if [ ! -e "${KSERVE_CRD_HELM_CHART_PATH}" ]; then
-    mkdir -p "${KSERVE_CRD_HELM_CHART_PATH}"
-    tar \
-        -xf "${KSERVE_CRD_HELM_CHART_TGZ_PATH}" \
-        -C "${KSERVE_CRD_HELM_CHART_PATH}" \
-        --strip-components=1
-fi
-
-# Download kserve Helm Chart from GitHub Release.
-# kserve is available at Helm Chart Repository only from version v0.12.0.
-# https://github.com/kserve/kserve/pkgs/container/charts%2Fkserve
-if [ ! -e "${KSERVE_HELM_CHART_TGZ_PATH}" ]; then
-    wget \
-        --no-clobber \
-        "${KSERVE_HELM_CHART_ARCHIVE_URL}" \
-        -O "${KSERVE_HELM_CHART_TGZ_PATH}"
-fi
-if [ ! -e "${KSERVE_HELM_CHART_PATH}" ]; then
-    mkdir -p "${KSERVE_HELM_CHART_PATH}"
-    tar \
-        -xf "${KSERVE_HELM_CHART_TGZ_PATH}" \
-        -C "${KSERVE_HELM_CHART_PATH}" \
-        --strip-components=1
-fi
-
-helm upgrade --install kserve-crd "${KSERVE_CRD_HELM_CHART_PATH}" \
-    --namespace kserve \
-    --create-namespace \
+# KNative Operator #
+kubectl apply -f "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/namespace.knative-serving.yaml"
+kubectl apply -f "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/namespace.knative-eventing.yaml"
+helm upgrade --install knative-operator "${KNATIVE_OPERATOR_HELM_CHART_ARCHIVE_URL}" \
+    --namespace: knative \
     --wait
 
-helm upgrade --install kserve "${KSERVE_HELM_CHART_PATH}" \
-    --namespace kserve \
+# KServe CRDs #
+helm upgrade --install kserve-crd "${KSERVE_CRD_HELM_CHART_ARCHIVE_URL}" \
+    --namespace kubeflow \
     --create-namespace \
-    --values values.kserve.yaml \
     --wait
 
-# TODO:  # NOTE(romanok1): is this still valid?
-# - add remaining knative/kserve integrations (AuthorizationPolicies, any user-profile annotations etc)
+# KServe #
+helm upgrade --install kserve "${KSERVE_HELM_CHART_ARCHIVE_URL}" \
+    --namespace kubeflow \
+    --create-namespace \
+    --values "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/values.kserve.yaml" \
+    --wait
 
-# Kubeflow fatchart
+# Kubeflow fatchart #
 helm upgrade --install kubeflow kubeflow \
     --namespace kubeflow \
     --repo https://kromanow94.github.io/kubeflow-manifests \
     --version 0.2.0 \
-    --values https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/values.kubeflow.yaml \
+    --values "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/values.kubeflow.yaml" \
     --wait
 
+# Kubeflow Profile #
 # Create kubeflow-user-example-com profile for tests.
 # Default password for user user@example.com:
 # 12341234
 kubectl apply -f profile.kubeflow-user-example-com.yaml
 
+# oauth2-proxy #
 # When k8s is deployed with in-cluster self-signed OIDC Issuer (kind, vcluster,
 # minikube and so on), oauth2-proxy has to wait for CRB allowing access to OIDC
 # Discovery endpoint from anonymous user. This CRB is deployed by kubeflow helm
@@ -194,5 +161,5 @@ helm upgrade --install oauth2-proxy oauth2-proxy \
     --create-namespace \
     --repo https://oauth2-proxy.github.io/manifests \
     --version 6.24.1 \
-    --values https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/values.oauth2-proxy.yaml \
+    --values "https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/values.oauth2-proxy.yaml" \
     --wait