diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ea2ec29cee098e4698ce0e09413552e0718c9cfd
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,9 @@
+build:
+  stage: build
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
+  script:
+    - mkdir -p /kaniko/.docker
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}
diff --git a/Dockerfile b/Dockerfile
index 307dad38836e725b3c5486a799ed6b0fab67bda3..6a44050344d1b46f0369babd391268c83e2edef1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
 FROM openjdk:8-jdk as builder
 
 # define arguments for versions to be used for platform and build tools
-ARG PLATFORM
-ARG BUILD_TOOLS
+ARG PLATFORM=30
+ARG BUILD_TOOLS=30.0.3
 
 RUN apt-get --quiet update --yes && \
     apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 62941bde3953398e85081cd5ac2f862c129aa0bb..0000000000000000000000000000000000000000
--- a/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-IMAGE := k8r.eu/justjanne/$(shell basename $(shell git remote get-url origin) .git)
-PLATFORM := 30
-BUILD_TOOLS := 30.0.3
-TAGS := $(PLATFORM)-$(BUILD_TOOLS)
-
-.PHONY: build
-build:
-	docker build --pull -t $(IMAGE):$(TAGS) . \
-	  --build-arg PLATFORM=$(PLATFORM) \
-	  --build-arg BUILD_TOOLS=$(BUILD_TOOLS)
-	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