diff --git a/src/jekyll/img/zeppelin_in-cluster_spark-client.png b/src/jekyll/img/zeppelin_in-cluster_spark-client.png
new file mode 100644
index 0000000..c34f1b2
Binary files /dev/null and b/src/jekyll/img/zeppelin_in-cluster_spark-client.png differ
diff --git a/src/jekyll/img/zeppelin_in-cluster_spark-cluster.png b/src/jekyll/img/zeppelin_in-cluster_spark-cluster.png
new file mode 100644
index 0000000..29ae841
Binary files /dev/null and b/src/jekyll/img/zeppelin_in-cluster_spark-cluster.png differ
diff --git a/src/jekyll/img/zeppelin_out-cluster_spark-cluster.png b/src/jekyll/img/zeppelin_out-cluster_spark-cluster.png
new file mode 100644
index 0000000..2d7d49a
Binary files /dev/null and b/src/jekyll/img/zeppelin_out-cluster_spark-cluster.png differ
diff --git a/src/jekyll/index.md b/src/jekyll/index.md
index 6fa3031..59268e3 100644
--- a/src/jekyll/index.md
+++ b/src/jekyll/index.md
@@ -24,9 +24,9 @@ This project was put up for voting in [an SPIP](http://apache-spark-developers-l
 in August 2017 and passed. It is in the process of being
 upstreamed into the apache/spark repository.
 
-
 ### Contents
 
 * [Running Spark on Kubernetes](./running-on-kubernetes.html)
 * [Running Spark in Cloud Environments](./running-on-kubernetes-cloud.html)
-* [Contribute](./contribute.html)
\ No newline at end of file
+* [Running Zeppelin with Spark on Kubernetes](./zeppelin.html)
+* [Contribute](./contribute.html)
diff --git a/src/jekyll/zeppelin.md b/src/jekyll/zeppelin.md
new file mode 100644
index 0000000..6005643
--- /dev/null
+++ b/src/jekyll/zeppelin.md
@@ -0,0 +1,76 @@
+---
+layout: global
+displayTitle: Apache Zeppelin running with Spark on Kubernetes
+title: Apache Zeppelin running with Spark on Kubernetes
+description: User Documentation for Apache Zeppelin running with Spark on Kubernetes
+tag: experimental
+---
+
+**Apache Zeppelin with Spark on Kubernetes is `experimental`**
+
+> At the time being, the needed code is not integrated in the `master` branches of `apache-zeppelin` nor the `apache-spark-on-k8s/spark` repositories.
+> You are welcome to already ty it out and send any feedback and question.
+
+First things first, you have to choose the following modes in which you will run Zeppelin with Spark on Kubernetes:
+
++ The `Kubernetes modes`: Can be `in-cluster` (within a Pod) or `out-cluster` (from outside the Kubernetes cluster).
++ The `Spark deployment modes`: Can be `client` or `cluster`.
+
+Only three combinations of these options are supported:
+
+1. `in-cluster` with `spark-client` mode.
+2. `in-cluster` with `spark-cluster` mode.
+3. `out-cluster` with `spark-cluster` mode.
+
+For now, to be able to test these combinations, you need to build specific branches (see hereafter) or to use third-party Helm charts or Docker images. The needed branches and related PR are listed here:
+
+1. In-cluster client mode [see pull request #456](https://github.com/apache-spark-on-k8s/spark/pull/456)
+2. Add support to run Spark interpreter on a Kubernetes cluster [see pull request #2637](https://github.com/apache/zeppelin/pull/2637)
+
+## In-Cluster with Spark-Client
+
+![In-Cluster with Spark-Client](/img/zeppelin_in-cluster_spark-client.png "In-Cluster with Spark-Client")
+
+Build a new Zeppelin based on [#456 In-cluster client mode](https://github.com/apache-spark-on-k8s/spark/pull/456).
+
+Once done, deploy that new build in a Kubernetes Pod with the following interpreter settings:
+
++ `spark.master`: k8s://https://kubernetes:443
++ `spark.submit.deployMode`: client
++ `spark.kubernetes.driver.pod.name`: The name of the pod where your Zeppelin instance is running.
++ `spark.app.name`: Any name you want, without space nor special characters.
++ Other spark.k8s properties you need to make your spark working (see [Running Spark on Kubernetes](./running-on-kubernetes.html)) such as `spark.kubernetes.initcontainer.docker.image`, `spark.kubernetes.driver.docker.image`, `spark.kubernetes.executor.docker.image`...
+
+## In-Cluster with Spark-Cluster
+
+![In-Cluster with Spark-Cluster](/img/zeppelin_in-cluster_spark-cluster.png "In-Cluster with Spark-Cluster")
+
+Build a new Zeppelin Docker image based on [#2637 Spark interpreter on a Kubernetes](https://github.com/apache/zeppelin/pull/2637).
+
+Once done, deploy that new build in a Kubernetes Pod with the following interpreter settings:
+
++ `spark.master`: k8s://https://kubernetes:443
++ `spark.submit.deployMode`: cluster
++ `spark.kubernetes.driver.pod.name`: Do not set this property.
++ `spark.app.name`: Any name you want, without space nor special characters.
++ Other spark.k8s properties you need to make your spark working (see [Running Spark on Kubernetes](./running-on-kubernetes.html)) such as `spark.kubernetes.initcontainer.docker.image`, `spark.kubernetes.driver.docker.image`, `spark.kubernetes.executor.docker.image`...
+
+## Out-Cluster with Spark-Cluster
+
+![Out-Cluster with Spark-Cluster](/img/zeppelin_out-cluster_spark-cluster.png "Out-Cluster with Spark-Cluster")
+
+Build a new Spark and their associated docker images based on [#2637 Spark interpreter on a Kubernetes](https://github.com/apache/zeppelin/pull/2637).
+
+Once done, any vanilla Apache Zeppelin deployed in a Kubernetes Pod (your can use a Helm chart for this) will work out-of-the box with the following interpreter settings:
+
++ `spark.master`: k8s://https://ip-address-of-the-kube-api:6443 (port may depend on your setup)
++ `spark.submit.deployMode`: cluster
++ `spark.kubernetes.driver.pod.name`: Do not set this property.
++ `spark.app.name`: Any name you want, without space nor special characters.
++ Other spark.k8s properties you need to make your spark working (see [Running Spark on Kubernetes](./running-on-kubernetes.html)) such as `spark.kubernetes.initcontainer.docker.image`, `spark.kubernetes.driver.docker.image`, `spark.kubernetes.executor.docker.image`...
+
+## How to test
+
+For now, you will have to build custom Spark or Zeppelin Docker images to suit your needs.
+
+[Helm Charts for Zeppelin](https://github.com/kubernetes/charts/blob/master/stable/spark/templates/spark-zeppelin-deployment.yaml) are available to deploy on your Kubernetes cluster.