diff --git a/docker/Dockerfile b/Dockerfile
similarity index 95%
rename from docker/Dockerfile
rename to Dockerfile
index a67a1a2..2a74585 100644
--- a/docker/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ COPY rest-server docker/*_user /usr/bin/
 
 VOLUME /data
 
-EXPOSE  80
+EXPOSE 80
 
 COPY docker/entrypoint.sh /entrypoint.sh
 
diff --git a/Makefile b/Makefile
index 2a45f24..933e2cd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,11 @@
-.PHONY: default rest-server install uninstall clean
+# Copyright © 2017 Zlatko Čalušić
+#
+# Use of this source code is governed by an MIT-style license that can be found in the LICENSE file.
+#
+
+DOCKER_IMAGE ?= restic/rest-server
+
+.PHONY: default rest-server install uninstall docker_build docker_push clean
 
 default: rest-server
 
@@ -11,5 +18,18 @@ install: rest-server
 uninstall:
 	sudo rm -f /usr/local/bin/rest-server
 
+docker_build:
+	docker pull golang:1.9.1-alpine
+	docker run --rm -it \
+		-v $(CURDIR):/go/src/github.com/restic/rest-server \
+		-w /go/src/github.com/restic/rest-server \
+		golang:1.9.1-alpine \
+		go run build.go
+	docker pull alpine:3.6
+	docker build -t $(DOCKER_IMAGE) .
+
+docker_push:
+	docker push $(DOCKER_IMAGE):latest
+
 clean:
 	rm -f rest-server
diff --git a/docker/build.sh b/docker/build.sh
deleted file mode 100755
index 23537c6..0000000
--- a/docker/build.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-echo "Build binary using golang docker image"
-docker run --rm -ti \
-    -v `pwd`:/go/src/github.com/restic/rest-server \
-    -w /go/src/github.com/restic/rest-server golang:1.9.1-alpine go run build.go
-
-echo "Build docker image restic/rest-server:latest"
-docker build --rm -t restic/rest-server:latest -f docker/Dockerfile .