diff --git a/Dockerfile-cli b/docker/Dockerfile-cli
similarity index 73%
rename from Dockerfile-cli
rename to docker/Dockerfile-cli
index cc6de00d6cc..7ea30f8b6b1 100644
--- a/Dockerfile-cli
+++ b/docker/Dockerfile-cli
@@ -7,10 +7,10 @@ WORKDIR $GOPATH/src/github.com/Masterminds
 RUN git clone https://github.com/Masterminds/glide.git
 RUN cd glide && git checkout v0.12.3 && make bootstrap-dist && make install
 
-RUN mkdir -p $GOPATH/src/github.com/uber/cadence
-COPY . $GOPATH/src/github.com/uber/cadence
-WORKDIR $GOPATH/src/github.com/uber/cadence
-RUN make cadence
+ENV CADENCE_HOME $GOPATH/src/github.com/uber/cadence
+RUN git clone https://github.com/uber/cadence.git $CADENCE_HOME
+WORKDIR $CADENCE_HOME
+RUN cd $CADENCE_HOME && make cadence
 
 FROM phusion/baseimage:0.10.1
 
diff --git a/docker/README.md b/docker/README.md
index 34b3fc602a1..25cbd87320e 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -12,7 +12,9 @@ cd $GOPATH/src/github.com/uber/cadence/docker
 docker-compose up
 ```
 
-View metrics at localhost:8080/dashboard
+View metrics at localhost:8080/dashboard    
+View Cadence-Web at localhost:8088  
+Use Cadence-CLI with `docker run --rm ubercadence/cli:master`
 
 
 Using a pre-built image
@@ -79,7 +81,7 @@ docker push ubercadence/server:master
     image: ubercadence/server:THE.LATEST.VERSION 
     ports
 ```
-3. Create the tar.gz file and upload to relase page
+3. Create the tar.gz file and upload to release page
 ```bash
 cd github.com/uber/cadence/docker
 tar -cvf docker.tar.gz *
diff --git a/docker/auto-build-docker-image.sh b/docker/auto-build-docker-image.sh
index 4cab84fedce..cd2a0125231 100644
--- a/docker/auto-build-docker-image.sh
+++ b/docker/auto-build-docker-image.sh
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 git pull
 curr_cm_id=`git show-ref --heads`
 last_cm_id=`cat .last_cm_id.txt`
@@ -6,5 +6,10 @@ cm_msg=`git log -1 --abbrev-commit`
 if [ "$last_cm_id" == "$curr_cm_id" ]; then
         echo "Last commit doesn't change."
 else
-        echo "Last commit changed. Start building..."  && docker build . -t ubercadence/server:master --build-arg git_branch=master && docker push ubercadence/server:master &&  mail -s "Docker image auto build succeeded HEAD: $curr_cm_id tag: master" longer@uber.com,maxim@uber.com,yiminc@uber.com,venkat@uber.com,krupapc@uber.com,samar@uber.com,wenquanx@uber.com,boweixu@uber.com,meiliang@uber.com,arthurg@uber.com,nathanbl@uber.com <<< "commit info: $cm_msg  " && echo $curr_cm_id > .last_cm_id.txt && echo "build succ!"
+        echo "Last commit changed. Start building..." \
+        && docker build . -t ubercadence/server:master --build-arg git_branch=master \
+        && docker push ubercadence/server:master \
+        && docker build . -f Dockerfile-cli -t ubercadence/cli:master --build-arg git_branch=master \
+        && docker push ubercadence/cli:master \
+        && mail -s "Docker image auto build succeeded HEAD: $curr_cm_id tag: master" longer@uber.com,maxim@uber.com,yiminc@uber.com,venkat@uber.com,krupapc@uber.com,samar@uber.com,wenquanx@uber.com,boweixu@uber.com,meiliang@uber.com,arthurg@uber.com,nathanbl@uber.com <<< "commit info: $cm_msg  " && echo $curr_cm_id > .last_cm_id.txt && echo "build succ!"
 fi
diff --git a/tools/cli/README.md b/tools/cli/README.md
index 37943ed70a2..e1c66570fa4 100644
--- a/tools/cli/README.md
+++ b/tools/cli/README.md
@@ -6,6 +6,7 @@ also start workflow, show workflow history, signal workflow ... and many other t
 ## How
 - Run `make bins`
 - You should see an executable `cadence`
+- (Optional) You could also use docker image `ubercadence/cli`, by replacing all the following `./cadence ...` with `docker run --rm ubercadence/cli:master ...`
 
 ## Quick Start
 Run `./cadence` to view help message. There are some top level commands and global options.