diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 969f0d0..8b0f858 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,8 @@
 job1:
   stage: build
-  image: docker
+  image: buildtool/build-tools:0.0.6
   services:
     - docker:dind
   script:
-    - docker version
-    - docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:latest .
-    - docker tag $CI_REGISTRY_IMAGE:latest $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
-    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
-    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
-    - docker push $CI_REGISTRY_IMAGE:latest
+    - build
+    - push
diff --git a/Dockerfile b/Dockerfile
index 3f465d4..6a0926f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM pliljenberg/java
+FROM openjdk:11
 MAINTAINER Joakim Olsson <joakim@unbound.se>
 
 RUN apt-get update \
@@ -11,4 +11,3 @@ RUN curl -SL http://ftp.se.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-ms
     && rm /tmp/msttfont.deb
 
 RUN echo "Europe/Stockholm" > /etc/timezone; dpkg-reconfigure -f noninteractive tzdata
-