diff --git a/Dockerfile b/Dockerfile
index 78b337f..8da8760 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,18 +3,26 @@ MAINTAINER tanhe123 from Coding IDE Team <tanhe123@coding.net>
 
 EXPOSE 8080
 
-# Add user `coding`
+RUN apt-get update && apt-get install -y zsh && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN useradd --create-home --home-dir /home/coding --shell /usr/bin/bash coding \
+# Add user `coding`
+RUN useradd --create-home --home-dir /home/coding --shell /usr/bin/zsh coding \
 	&& echo "coding:coding" | chpasswd \
 	&& adduser coding sudo \
-	&& echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+	&& echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers 
 
 USER coding
-
+ENV HOME /home/coding
+ENV SHELL /usr/bin/zsh
+ENV TERM xterm
 ADD . /opt/coding/WebIDE
 
-RUN sudo chown -R coding /opt/coding/WebIDE
+# Install oh-my-zsh
+RUN git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh \
+	&& cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
+
+RUN sudo chown -R coding /opt/coding/WebIDE \
+    && mkdir $HOME/.m2
 
 RUN cd /opt/coding/WebIDE/frontend && npm install && npm run build \
 	&& cd /opt/coding/WebIDE/frontend-webjars && mvn clean install \
@@ -22,6 +30,8 @@ RUN cd /opt/coding/WebIDE/frontend && npm install && npm run build \
 	&& cp /opt/coding/WebIDE/backend/target/ide-backend.jar /opt/coding/WebIDE \
 	&& cd /opt/coding/WebIDE/frontend && rm -r build node_modules \
 	&& cd /opt/coding/WebIDE/frontend-webjars && mvn clean \
-	&& cd /opt/coding/WebIDE/backend && mvn clean
+	&& cd /opt/coding/WebIDE/backend && mvn clean \
+	&& rm -fr $HOME/.m2
 
+ENV CODING_IDE_HOME /home/coding/coding-ide-home
 CMD ["java", "-jar", "/opt/coding/WebIDE/ide-backend.jar", "--PTY_LIB_FOLDER=/opt/coding/WebIDE/backend/src/main/resources/lib"]
diff --git a/README.md b/README.md
index e27979b..1dfda7d 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@ If changed, restart the application to let your configurations take effect. Note
 ## Docker Server
 
 ```
-docker run -p 8080:8080 --name webide webide/webide
+docker run -p 8080:8080 -h webide --name webide webide/webide
 ```
 
 To learn more about docker commands，please refer to wiki [English](https://github.com/Coding/WebIDE/wiki/Docker-Server.en) [中文](https://github.com/Coding/WebIDE/wiki/Docker-Server.zh)
diff --git a/frontend b/frontend
index 39ad916..9e007fd 160000
--- a/frontend
+++ b/frontend
@@ -1 +1 @@
-Subproject commit 39ad916aa702d203852ce1d7f35327535602c5dd
+Subproject commit 9e007fd1c64cfca9b1c2df181a3884b0d0f29390
diff --git a/ide.sh b/ide.sh
index 50659d5..88b7c8f 100755
--- a/ide.sh
+++ b/ide.sh
@@ -193,7 +193,7 @@ sub_docker() {
         create_dir_if_not_exist $HOME/.coding-ide-home
 
         echo "creating container $CONTAINER"
-        docker create -p 8080:8080 -v $HOME/.coding-ide-home:/home/coding/.coding-ide-home --name webide webide/webide
+        docker create -p 8080:8080 -v $HOME/.coding-ide-home:/home/coding/coding-ide-home --name webide -h webide  webide/webide
         valid_last_cmd
       elif [ "$RUNNING" == "true" ]; then
         echo "CRITICAL - $CONTAINER is running."