diff --git a/.gitignore b/.gitignore
index 30aa775..8fb0034 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,8 +25,10 @@ _testmain.go
 
 gin-bin
 key.pem
-config.yaml
+config.yml
 bin/*
 .DS_Store
 coverage.out
 gopush/log/*.log
+build.tar.gz
+gopush.tar.gz
diff --git a/Makefile b/Makefile
index 01f7a66..b738c82 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ VERSION=0.0.1
 DEPS := $(wildcard *.go)
 BUILD_IMAGE := "appleboy/gopush-build:latest"
 TEST_IMAGE := "appleboy/gopush-testing:latest"
+PRODUCTION_IMAGE := "appleboy/gopush"
 
 all: build
 
@@ -15,15 +16,14 @@ test:
 	cd gopush && go test -v -covermode=count -coverprofile=coverage.out
 
 docker_build: clean
-	tar -zcvf build.tar.gz gopush.go gopush script
+	tar -zcvf build.tar.gz gopush.go gopush
 	docker build --rm -t $(BUILD_IMAGE) -f docker/Dockerfile.build .
-	docker run --rm $(BUILD_IMAGE) > bin.tar.gz
-	tar -zxvf bin.tar.gz
-	-rm -rf bin.tar.gz build.tar.gz
+	docker run --rm $(BUILD_IMAGE) > gopush.tar.gz
+	docker build --rm -t $(PRODUCTION_IMAGE) -f docker/Dockerfile.dist .
 
 docker_test:
 	@docker build --rm -t $(TEST_IMAGE) -f docker/Dockerfile.testing .
 	@docker run --rm -e ANDROID_TEST_TOKEN=$(ANDROID_TEST_TOKEN) -e ANDROID_API_KEY=$(ANDROID_API_KEY) $(TEST_IMAGE) sh -c "cd gopush && go test -v"
 
 clean:
-	rm -rf build.tar.gz bin.tar.gz bin/*
+	-rm -rf build.tar.gz gopush.tar.gz bin/*
diff --git a/config/config.yml b/config/config.yml
index 7db709a..66eeafe 100644
--- a/config/config.yml
+++ b/config/config.yml
@@ -11,8 +11,8 @@ api:
   stat_go_uri: "/api/status"
 
 android:
-  enabled: false
-  apikey: ""
+  enabled: true
+  apikey: "YOUR_API_KEY"
 
 ios:
   enabled: false
diff --git a/docker/Dockerfile.build b/docker/Dockerfile.build
index 1e318aa..d70de57 100644
--- a/docker/Dockerfile.build
+++ b/docker/Dockerfile.build
@@ -1,11 +1,12 @@
-FROM golang:1.6
+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 sh script/build.sh
+RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w" -o bin/gopush gopush.go
 
-CMD tar -czf - bin
+CMD tar -C bin -czf - gopush
diff --git a/docker/Dockerfile.dist b/docker/Dockerfile.dist
new file mode 100644
index 0000000..d919fd8
--- /dev/null
+++ b/docker/Dockerfile.dist
@@ -0,0 +1,13 @@
+FROM alpine
+
+MAINTAINER Bo-Yi Wu <appleboy.tw@gmail.com>
+
+RUN apk update && apk upgrade \
+  && apk add ca-certificates \
+  && rm -rf /var/cache/apk/*
+
+RUN mkdir /app
+ADD gopush.tar.gz /app/
+WORKDIR /app
+ENTRYPOINT ["./gopush", "-c", "config/config.yml"]
+EXPOSE 8088