diff --git a/Dockerfile b/Dockerfile
index 25d719a3cceba9d6c32160648208ea20b8ccb83f..687c7d78eef99564266bd7e8f2c9c80b42c84907 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,12 @@
-FROM golang as builder
-RUN curl https://glide.sh/get | sh
+FROM golang:alpine as builder
 
-WORKDIR /go/src/app
-COPY glide.lock glide.yaml ./
-RUN glide install
-COPY . .
-RUN CGO_ENABLED=0 GOOS=linux go build -a app .
+WORKDIR /src
+COPY go.* ./
+RUN go mod download
+COPY *.go ./
+RUN CGO_ENABLED=0 GOOS=linux go build -o app .
 
 FROM scratch
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=builder /go/src/app/app /app
-ENTRYPOINT ["/app"]
\ No newline at end of file
+COPY --from=builder /src/app /app
+ENTRYPOINT ["/app"]
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 f96f35eac0249a9a33f003c177a2fedac593aed2..0000000000000000000000000000000000000000
--- a/build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-IMAGE=k8r.eu/justjanne/quasseldroid-helper-bot
-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 c372a8c06a39f116158e10c904457dc157d7af72..0000000000000000000000000000000000000000
--- a/deploy.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-IMAGE=k8r.eu/justjanne/quasseldroid-helper-bot
-TAGS=$(git describe --always --tags HEAD)
-DEPLOYMENT=quasseldroid-helper-bot
-POD=quasseldroid-helper-bot
-
-kubectl set image deployment/${DEPLOYMENT} ${POD}=${IMAGE}:${TAGS}
\ No newline at end of file
diff --git a/glide.lock b/glide.lock
deleted file mode 100644
index 1d7e4a2bf666b365108ebaf5122954ea2684be7b..0000000000000000000000000000000000000000
--- a/glide.lock
+++ /dev/null
@@ -1,35 +0,0 @@
-hash: 5d07684a0b4bfd1931fa78901e4432aadb8182a496da1a42805789f2338e0804
-updated: 2018-06-03T15:32:09.619213894+02:00
-imports:
-- name: github.com/golang/protobuf
-  version: 3a3da3a4e26776cc22a79ef46d5d58477532dede
-  subpackages:
-  - proto
-- name: github.com/google/go-querystring
-  version: 53e6ce116135b80d037921a7fdd5138cf32d7a8a
-  subpackages:
-  - query
-- name: github.com/lrstanley/girc
-  version: 102f17f86306c2152a8c6188f9bb8b0e7288de31
-- name: github.com/xanzy/go-gitlab
-  version: e519e706ac14090a3d11d11150fe6771a1a561cc
-- name: golang.org/x/net
-  version: 1e491301e022f8f977054da4c2d852decd59571f
-  subpackages:
-  - context
-  - context/ctxhttp
-- name: golang.org/x/oauth2
-  version: 1e0a3fa8ba9a5c9eb35c271780101fdaf1b205d7
-  subpackages:
-  - internal
-- name: google.golang.org/appengine
-  version: b1f26356af11148e710935ed1ac8a7f5702c7612
-  subpackages:
-  - internal
-  - internal/base
-  - internal/datastore
-  - internal/log
-  - internal/remote_api
-  - internal/urlfetch
-  - urlfetch
-testImports: []
diff --git a/glide.yaml b/glide.yaml
deleted file mode 100644
index f7e4de4b287096830efcb7decff9f46cbca5bffa..0000000000000000000000000000000000000000
--- a/glide.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-package: git.kuschku.de/justjanne/quasseldroid-helper-bot
-import:
-- package: github.com/lrstanley/girc
-- package: github.com/xanzy/go-gitlab
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000000000000000000000000000000000000..b2f82f839c6c402bcb8363f9ca47d93303330992
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,13 @@
+module git.kuschku.de/justjanne/quasseldroid-helper-bot
+
+go 1.13
+
+require (
+	github.com/golang/protobuf v1.1.1-0.20180522224251-3a3da3a4e267
+	github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135
+	github.com/lrstanley/girc v0.0.0-20180427160007-102f17f86306
+	github.com/xanzy/go-gitlab v0.10.6-0.20180601064841-e519e706ac14
+	golang.org/x/net v0.0.0-20180530234432-1e491301e022
+	golang.org/x/oauth2 v0.0.0-20180603041954-1e0a3fa8ba9a
+	google.golang.org/appengine v1.1.0
+)