diff --git a/book/src/Setup.md b/book/src/Setup.md
index 30cbc754..d2b5b113 100644
--- a/book/src/Setup.md
+++ b/book/src/Setup.md
@@ -7,15 +7,22 @@ Kubernetes v1.9 must be setup to support the new technologies required to enable
 * API Server binary:
 
 ```
---feature-gates=CSIPersistentVolume=true \
+--allow-privileged=true
+--feature-gates=CSIPersistentVolume=true,MountPropagation=true
 --runtime-config=storage.k8s.io/v1alpha1=true
 ```
 
-* API Server binary and kubelet binaries:
+* Controller-manager binary
+
+```
+--feature-gates=CSIPersistentVolume=true
+```
+
+* Kubelet
 
 ```
---feature-gates=MountPropagation=true \
 --allow-privileged=true
+--feature-gates=CSIPersistentVolume=true,MountPropagation=true
 ```
 
 ### Developers
@@ -24,7 +31,7 @@ If you are a developer and are using the script `cluster/kube-up.sh` from the Ku
 
 ```
 export KUBE_RUNTIME_CONFIG="storage.k8s.io/v1alpha1=true"
-export KUBE_FEATURE_GATES="CSIPersistentVolume=true"
+export KUBE_FEATURE_GATES="MountPropagation=true,CSIPersistentVolume=true"
 ```
 
 ### Confirming the setup
diff --git a/docs/Setup.html b/docs/Setup.html
index 0867583d..dc2b521d 100644
--- a/docs/Setup.html
+++ b/docs/Setup.html
@@ -93,19 +93,25 @@ <h1 class="menu-title">Kubernetes CSI Documentation</h1>
 <ul>
 <li>API Server binary:</li>
 </ul>
-<pre><code>--feature-gates=CSIPersistentVolume=true \
+<pre><code>--allow-privileged=true
+--feature-gates=CSIPersistentVolume=true,MountPropagation=true
 --runtime-config=storage.k8s.io/v1alpha1=true
 </code></pre>
 <ul>
-<li>API Server binary and kubelet binaries:</li>
+<li>Controller-manager binary</li>
 </ul>
-<pre><code>--feature-gates=MountPropagation=true \
---allow-privileged=true
+<pre><code>--feature-gates=CSIPersistentVolume=true
+</code></pre>
+<ul>
+<li>Kubelet</li>
+</ul>
+<pre><code>--allow-privileged=true
+--feature-gates=CSIPersistentVolume=true,MountPropagation=true
 </code></pre>
 <a class="header" href="Setup.html#developers" id="developers"><h3>Developers</h3></a>
 <p>If you are a developer and are using the script <code>cluster/kube-up.sh</code> from the Kubernetes repo, then you can set values using the following environment variables:</p>
 <pre><code>export KUBE_RUNTIME_CONFIG=&quot;storage.k8s.io/v1alpha1=true&quot;
-export KUBE_FEATURE_GATES=&quot;CSIPersistentVolume=true&quot;
+export KUBE_FEATURE_GATES=&quot;MountPropagation=true,CSIPersistentVolume=true&quot;
 </code></pre>
 <a class="header" href="Setup.html#confirming-the-setup" id="confirming-the-setup"><h3>Confirming the setup</h3></a>
 <p>Once the system is up, to confirm if the runtime config has taken effect, the following command should return that there are no resources and not return an error:</p>
diff --git a/docs/print.html b/docs/print.html
index 7096bfec..0245f751 100644
--- a/docs/print.html
+++ b/docs/print.html
@@ -100,19 +100,25 @@ <h1 class="menu-title">Kubernetes CSI Documentation</h1>
 <ul>
 <li>API Server binary:</li>
 </ul>
-<pre><code>--feature-gates=CSIPersistentVolume=true \
+<pre><code>--allow-privileged=true
+--feature-gates=CSIPersistentVolume=true,MountPropagation=true
 --runtime-config=storage.k8s.io/v1alpha1=true
 </code></pre>
 <ul>
-<li>API Server binary and kubelet binaries:</li>
+<li>Controller-manager binary</li>
 </ul>
-<pre><code>--feature-gates=MountPropagation=true \
---allow-privileged=true
+<pre><code>--feature-gates=CSIPersistentVolume=true
+</code></pre>
+<ul>
+<li>Kubelet</li>
+</ul>
+<pre><code>--allow-privileged=true
+--feature-gates=CSIPersistentVolume=true,MountPropagation=true
 </code></pre>
 <a class="header" href="print.html#developers" id="developers"><h3>Developers</h3></a>
 <p>If you are a developer and are using the script <code>cluster/kube-up.sh</code> from the Kubernetes repo, then you can set values using the following environment variables:</p>
 <pre><code>export KUBE_RUNTIME_CONFIG=&quot;storage.k8s.io/v1alpha1=true&quot;
-export KUBE_FEATURE_GATES=&quot;CSIPersistentVolume=true&quot;
+export KUBE_FEATURE_GATES=&quot;MountPropagation=true,CSIPersistentVolume=true&quot;
 </code></pre>
 <a class="header" href="print.html#confirming-the-setup" id="confirming-the-setup"><h3>Confirming the setup</h3></a>
 <p>Once the system is up, to confirm if the runtime config has taken effect, the following command should return that there are no resources and not return an error:</p>