diff --git a/Makefile b/Makefile
index fd09daf..301c6e7 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ html:
 	go tool cover -html=coverage.out
 
 docker_build: clean
-	tar -zcvf build.tar.gz gorush.go gorush
+	tar -zcvf build.tar.gz gorush.go gorush config storage Makefile glide.lock glide.yaml
 	docker build --rm -t $(BUILD_IMAGE) -f docker/Dockerfile.build .
 	docker run --rm $(BUILD_IMAGE) > gorush.tar.gz
 	docker build --rm -t $(PRODUCTION_IMAGE) -f docker/Dockerfile.dist .
diff --git a/docker/Dockerfile.build b/docker/Dockerfile.build
index 6b90f82..497dc0b 100644
--- a/docker/Dockerfile.build
+++ b/docker/Dockerfile.build
@@ -2,11 +2,12 @@ FROM golang:1.6-alpine
 
 MAINTAINER Bo-Yi Wu <appleboy.tw@gmail.com>
 
-RUN apk --update add git
-RUN mkdir -p /tmp/build
-Add build.tar.gz /tmp/build/
-WORKDIR /tmp/build
-RUN go get -v -d
+RUN apk --update add git make
+RUN go get github.com/Masterminds/glide && cd $GOPATH/src/github.com/Masterminds/glide && make install
+RUN mkdir -p $GOPATH/src/github.com/appleboy/gorush
+Add build.tar.gz $GOPATH/src/github.com/appleboy/gorush/
+WORKDIR $GOPATH/src/github.com/appleboy/gorush
+RUN make bundle
 RUN GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o bin/gorush gorush.go
 
 CMD tar -C bin -czf - gorush
diff --git a/docker/Dockerfile.dist b/docker/Dockerfile.dist
index d6e31fd..e8b9386 100644
--- a/docker/Dockerfile.dist
+++ b/docker/Dockerfile.dist
@@ -8,7 +8,7 @@ RUN apk update && apk upgrade \
 
 RUN mkdir /app
 ADD gorush.tar.gz /app/
-ADD config/config.yml /app/config
+ADD config/config.yml /app/config/
 WORKDIR /app
 ENTRYPOINT ["./gorush", "-c", "config/config.yml"]
 EXPOSE 8088
diff --git a/script/build.sh b/script/build.sh
index 619e920..441d2cb 100755
--- a/script/build.sh
+++ b/script/build.sh
@@ -10,7 +10,7 @@ for GOOS in $OS; do
     (test "$GOOS" = "windows") && EXE="gorush.exe"
 
     echo "Build: ${GOOS}, Arch: ${GOARCH}, EXE: ${EXE}"
-    GOOS=$GOOS GOARCH=$GOARCH go build -ldflags="-w" -o bin/$GOOS/$GOARCH/${EXE} gorush.go;
+    GOOS=$GOOS GOARCH=$GOARCH go build -ldflags="-s -w" -o bin/$GOOS/$GOARCH/${EXE} gorush.go;
     tar -C bin/$GOOS/$GOARCH -czf bin/gorush-$VERSION-$GOOS-$GOARCH.tar.gz gorush
   done
 done