diff --git a/bin/common.cmd b/bin/common.cmd
index c84f0778291..b4fb6bf4d23 100644
--- a/bin/common.cmd
+++ b/bin/common.cmd
@@ -81,13 +81,6 @@ if not defined JAVA_OPTS (
     set JAVA_OPTS=%JAVA_OPTS% %ZEPPELIN_JAVA_OPTS%
 )
 
-if not defined ZEPPELIN_INTP_JAVA_OPTS (
-    set ZEPPELIN_INTP_JAVA_OPTS=%ZEPPELIN_JAVA_OPTS%
-)
-
-if not defined ZEPPELIN_INTP_MEM (
-    set ZEPPELIN_INTP_MEM=%ZEPPELIN_MEM%
-)
 
 set JAVA_INTP_OPTS=%ZEPPELIN_INTP_JAVA_OPTS% -Dfile.encoding=%ZEPPELIN_ENCODING%
 
diff --git a/bin/common.sh b/bin/common.sh
index 592aa1c89e8..b69f28cf0c7 100644
--- a/bin/common.sh
+++ b/bin/common.sh
@@ -121,15 +121,6 @@ JAVA_OPTS+=" ${ZEPPELIN_JAVA_OPTS} -Dfile.encoding=${ZEPPELIN_ENCODING} ${ZEPPEL
 JAVA_OPTS+=" -Dlog4j.configuration=file://${ZEPPELIN_CONF_DIR}/log4j.properties"
 export JAVA_OPTS
 
-# jvm options for interpreter process
-if [[ -z "${ZEPPELIN_INTP_JAVA_OPTS}" ]]; then
-  export ZEPPELIN_INTP_JAVA_OPTS="${ZEPPELIN_JAVA_OPTS}"
-fi
-
-if [[ -z "${ZEPPELIN_INTP_MEM}" ]]; then
-  export ZEPPELIN_INTP_MEM="${ZEPPELIN_MEM}"
-fi
-
 JAVA_INTP_OPTS="${ZEPPELIN_INTP_JAVA_OPTS} -Dfile.encoding=${ZEPPELIN_ENCODING}"
 JAVA_INTP_OPTS+=" -Dlog4j.configuration=file://${ZEPPELIN_CONF_DIR}/log4j.properties"
 export JAVA_INTP_OPTS
diff --git a/conf/zeppelin-env.cmd.template b/conf/zeppelin-env.cmd.template
index d85e59f2709..9c7f7f77ef5 100644
--- a/conf/zeppelin-env.cmd.template
+++ b/conf/zeppelin-env.cmd.template
@@ -20,8 +20,8 @@ REM set JAVA_HOME=
 REM set MASTER=                 		REM Spark master url. eg. spark://master_addr:7077. Leave empty if you want to use local mode.
 REM set ZEPPELIN_JAVA_OPTS      		REM Additional jvm options. for example, set ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory=8g -Dspark.cores.max=16"
 REM set ZEPPELIN_MEM            		REM Zeppelin jvm mem options Default -Xmx1024m -XX:MaxPermSize=512m
-REM set ZEPPELIN_INTP_MEM       		REM zeppelin interpreter process jvm mem options. Default = ZEPPELIN_MEM
-REM set ZEPPELIN_INTP_JAVA_OPTS 		REM zeppelin interpreter process jvm options. Default = ZEPPELIN_JAVA_OPTS
+REM set ZEPPELIN_INTP_MEM       		REM zeppelin interpreter process jvm mem options.
+REM set ZEPPELIN_INTP_JAVA_OPTS 		REM zeppelin interpreter process jvm options.
 
 REM set ZEPPELIN_LOG_DIR        		REM Where log files are stored.  PWD by default.
 REM set ZEPPELIN_PID_DIR        		REM The pid files are stored. /tmp by default.
diff --git a/conf/zeppelin-env.sh.template b/conf/zeppelin-env.sh.template
index 52e36f7b5f6..3d12560c896 100644
--- a/conf/zeppelin-env.sh.template
+++ b/conf/zeppelin-env.sh.template
@@ -20,8 +20,8 @@
 # export MASTER=                 		# Spark master url. eg. spark://master_addr:7077. Leave empty if you want to use local mode.
 # export ZEPPELIN_JAVA_OPTS      		# Additional jvm options. for example, export ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory=8g -Dspark.cores.max=16"
 # export ZEPPELIN_MEM            		# Zeppelin jvm mem options Default -Xmx1024m -XX:MaxPermSize=512m
-# export ZEPPELIN_INTP_MEM       		# zeppelin interpreter process jvm mem options. Default = ZEPPELIN_MEM
-# export ZEPPELIN_INTP_JAVA_OPTS 		# zeppelin interpreter process jvm options. Default = ZEPPELIN_JAVA_OPTS
+# export ZEPPELIN_INTP_MEM       		# zeppelin interpreter process jvm mem options.
+# export ZEPPELIN_INTP_JAVA_OPTS 		# zeppelin interpreter process jvm options.
 
 # export ZEPPELIN_LOG_DIR        		# Where log files are stored.  PWD by default.
 # export ZEPPELIN_PID_DIR        		# The pid files are stored. ${ZEPPELIN_HOME}/run by default.
diff --git a/docs/install/upgrade.md b/docs/install/upgrade.md
index a831eb98d4e..d5642869126 100644
--- a/docs/install/upgrade.md
+++ b/docs/install/upgrade.md
@@ -43,4 +43,10 @@ So, copying `notebook` and `conf` directory should be enough.
 
    ```
    bin/zeppelin-daemon.sh start
-   ```
\ No newline at end of file
+   ```
+
+## Migration Guide
+
+### Upgrading from Zeppelin 0.6 to 0.7
+
+ - From 0.7, we don't use `ZEPPELIN_JAVA_OPTS` as default value of `ZEPPELIN_INTP_JAVA_OPTS` and also the same for `ZEPPELIN_MEM`/`ZEPPELIN_INTP_MEM`. If user want to configure the jvm opts of interpreter process, please set `ZEPPELIN_INTP_JAVA_OPTS` and `ZEPPELIN_INTP_MEM` explicitly.
\ No newline at end of file