diff --git a/dev/create_release.sh b/dev/create_release.sh
index cec81c0..6c84e7b 100755
--- a/dev/create_release.sh
+++ b/dev/create_release.sh
@@ -98,8 +98,8 @@
 
 git_clone
 make_source_package
-make_binary_release all "-Phadoop-2.6 -Pscala-${SCALA_VERSION}"
-make_binary_release netinst "-Phadoop-2.6 -Pscala-${SCALA_VERSION} -pl zeppelin-interpreter,zeppelin-zengine,:zeppelin-display_${SCALA_VERSION},:zeppelin-spark-dependencies_${SCALA_VERSION},:zeppelin-spark_${SCALA_VERSION},zeppelin-web,zeppelin-server,zeppelin-distribution -am"
+make_binary_release all "-Pweb-angular -Phadoop-2.6"
+make_binary_release netinst "-Pweb-angular -Phadoop-2.6 -pl zeppelin-server,zeppelin-display,markdown,shell,spark/spark-dependencies,zeppelin-web,zeppelin-web-angular,zeppelin-distribution -am"
 
 # remove non release files and dirs
 rm -rf "${WORKING_DIR}/zeppelin"
diff --git a/dev/tag_release.sh b/dev/tag_release.sh
index 14096ae..9145d8d 100755
--- a/dev/tag_release.sh
+++ b/dev/tag_release.sh
@@ -28,7 +28,7 @@
 
 set -e
 
-git clone https://git-wip-us.apache.org/repos/asf/zeppelin.git "${WORKING_DIR}"
+git clone https://gitbox.apache.org/repos/asf/zeppelin.git "${WORKING_DIR}"
 pushd "${WORKING_DIR}" 
 
 git checkout "${GIT_BRANCH}"
diff --git a/pom.xml b/pom.xml
index 2181354..6090865 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,6 +65,7 @@
     <module>spark</module>
     <module>submarine</module>
     <module>markdown</module>
+    <module>mongodb</module>
     <module>angular</module>
     <module>shell</module>
     <module>livy</module>
@@ -96,7 +97,6 @@
     <module>zeppelin-jupyter</module>
     <module>zeppelin-plugins</module>
     <module>zeppelin-distribution</module>
-    <module>mongodb</module>
   </modules>
 
   <properties>