diff --git a/hadoop/CDH/defaults/main.yml b/hadoop/CDH/defaults/main.yml
index 2be08887..826671b6 100644
--- a/hadoop/CDH/defaults/main.yml
+++ b/hadoop/CDH/defaults/main.yml
@@ -53,6 +53,7 @@ cdh_zeppelin_conf_files:
 cdh_zeppelin_ldap_auth: True
 cdh_zeppelin_notebook_public: 'false'
 cdh_zeppelin_dedicated_node: False
+cdh_zeppelin_use_spark2: '{{ cdh_spark2_enabled }}'
 
 cdh_impala_load_balancer: False
 
diff --git a/hadoop/CDH/templates/zeppelin-env.sh b/hadoop/CDH/templates/zeppelin-env.sh
index d179a6a6..8d6cdaf6 100644
--- a/hadoop/CDH/templates/zeppelin-env.sh
+++ b/hadoop/CDH/templates/zeppelin-env.sh
@@ -8,8 +8,12 @@ export ZEPPELIN_NOTEBOOK_DIR="{{ cdh_zeppelin_home }}/notebook"
 export ZEPPELIN_MEM="-Xms4096m -Xmx4096m"
 export ZEPPELIN_INTP_MEM="-Xms4096m -Xmx4096m"
 
+{% if cdh_zeppelin_use_spark2 %}
+export SPARK_HOME=/opt/cloudera/parcels/SPARK2-2.2.0.cloudera2-1.cdh5.12.0.p0.232957/lib/spark2
+{% else %}
 # export MASTER=                                # Spark master url. eg. spark://master_addr:7077. Leave empty if you want to use local mode.
 export SPARK_HOME=/opt/cloudera/parcels/CDH-5.9.3-1.cdh5.9.3.p0.4/lib/spark
+{% endif %}
 export DEFAULT_HADOOP_HOME=/opt/cloudera/parcels/CDH-5.9.3-1.cdh5.9.3.p0.4/lib/hadoop
 export SPARK_JAR_HDFS_PATH=${SPARK_JAR_HDFS_PATH:-''}
 export SPARK_LAUNCH_WITH_SCALA=0