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
diff --git a/build.sh b/build.sh
deleted file mode 100755
index 7ec5d73537824fc85c20eeb65bfa683beaa3fea2..0000000000000000000000000000000000000000
--- a/build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-IMAGE=k8r.eu/justjanne/custom-errors
-TAGS=$(git describe --always --tags HEAD)
-
-docker build -t $IMAGE:$TAGS .
-docker tag $IMAGE:$TAGS $IMAGE:latest
-echo Successfully tagged $IMAGE:latest
-docker push $IMAGE:$TAGS
-docker push $IMAGE:latest
\ No newline at end of file
diff --git a/deploy.sh b/deploy.sh
deleted file mode 100755
index c362d42133ab9813ca91b0d9afa2c8eefcd6e713..0000000000000000000000000000000000000000
--- a/deploy.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-IMAGE=k8r.eu/justjanne/custom-errors
-TAGS=$(git describe --always --tags HEAD)
-DEPLOYMENT=default-http-backend
-POD=default-http-backend
-NAMESPACE=ingress
-
-kubectl -n $NAMESPACE set image deployment/$DEPLOYMENT $POD=$IMAGE:$TAGS
\ No newline at end of file