diff --git a/circle.yml b/circle.yml
index 1ac6199e..a74708fa 100644
--- a/circle.yml
+++ b/circle.yml
@@ -13,11 +13,13 @@ dependencies:
   cache_directories:
     - "~/.electron"
     - "src/node_modules"
+    - "~/docker_cache"
   pre:
     - npm install -g npm@3.3.12
   post:
+    - ./docker/circle_docker_build.sh
     - mkdir -p ~/.electron
-    - docker run --rm -it -v `pwd`:/home/xclient/electron-mattermost -v ~/.electron:/home/xclient/.electron yuyaoc/em-builder:dev ./electron-mattermost/docker/package_in_docker.sh
+    - docker run --rm -it -v `pwd`:/home/xclient/electron-mattermost -v ~/.electron:/home/xclient/.electron yuya-oc/em-builder ./electron-mattermost/docker/package_in_docker.sh
     - mv release/Mattermost-win32-ia32 release/mattermost-desktop-win32
     - mv release/Mattermost-win32-x64  release/mattermost-desktop-win64
     - mv release/Mattermost-darwin-x64 release/mattermost-desktop-osx
diff --git a/docker/circle_docker_build.sh b/docker/circle_docker_build.sh
new file mode 100755
index 00000000..0995e57f
--- /dev/null
+++ b/docker/circle_docker_build.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+# execute from source root
+set -ex
+CACHE_DIR=~/docker_cache
+if [ -e ${CACHE_DIR}/em-builder.tar ] && md5sum -c ${CACHE_DIR}/dockerfile.md5sum
+then
+  docker load < ${CACHE_DIR}/em-builder.tar
+else
+  mkdir -p ${CACHE_DIR}
+  docker build -t yuya-oc/em-builder docker
+  md5sum docker/Dockerfile > ${CACHE_DIR}/dockerfile.md5sum
+  docker save yuya-oc/em-builder > ${CACHE_DIR}/em-builder.tar
+fi