diff --git a/Dockerfile b/Dockerfile
index 6f1be07dc9855fbb45505b20062292c898e5b0bd..5cd645f7889657a821d95b02fd4437d405ec4f9e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,8 @@
 FROM openjdk:8-jre
 
 RUN apt-get update && \
-    apt-get install -y libgdiplus
+    apt-get install -y --no-install-recommends \
+      libgdiplus
 
 ADD http://mcmyadmin.com/Downloads/MCMA2_glibc26_2.zip /tmp/
 ADD http://mcmyadmin.com/Downloads/etc.zip /tmp/
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..1949a53a90813eeb4dd4499fcd0ca9d00aa2a68c
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,14 @@
+IMAGE := k8r.eu/justjanne/$(shell basename $(shell git remote get-url origin) .git)
+TAGS := $(shell git describe --always --tags HEAD)
+
+.PHONY: build
+build:
+	docker build --pull -t $(IMAGE):$(TAGS) .
+	docker tag $(IMAGE):$(TAGS) $(IMAGE):latest
+	@echo Successfully tagged $(IMAGE):$(TAGS) as latest
+
+.PHONY: push
+push: build
+	docker push $(IMAGE):$(TAGS)
+	docker push $(IMAGE):latest
+	@echo Successfully pushed $(IMAGE):$(TAGS) as latest