diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d80ddd428ae7c593f509d354511947c6d7727b55..cc096c10b26a340677baf79f7b53140f5cd0cd38 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,10 @@
 image: docker:latest
 
 variables:
-  VERSION: v2.14.3
-  DOCKER_DRIVER: overlay
+  VERSION: v2.15.0
 
 services:
-  - docker:dind
+  - docker:18-dind
 
 before_script:
   - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin
@@ -13,15 +12,13 @@ before_script:
 build-master:
   stage: build
   script:
-    - 
-      docker build 
-        --build-arg REF_NAME=$VERSION 
-        --build-arg VCS_REF=$CI_COMMIT_REF_SLUG 
-        --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` 
-        -t $CI_REGISTRY_IMAGE .
-    - docker push $CI_REGISTRY_IMAGE
+    - docker pull $CI_REGISTRY_IMAGE:$VERSION
+    - docker tag $CI_REGISTRY_IMAGE:$VERSION $CI_REGISTRY_IMAGE:latest
+    - docker push $CI_REGISTRY_IMAGE:latest
   only:
     - master
+  tags:
+    - docker
 
 build:
   stage: build
@@ -35,3 +32,5 @@ build:
     - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
   except:
     - master
+  tags:
+    - docker
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 6d7ceb453e891a604e9ebaeaa4377feab46ab414..807d0dc977c122c56d454c9ea42f38047e10b1cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ RUN apt-get update \
  && curl -Ls https://storage.googleapis.com/kubernetes-helm/helm-${HELM_VERSION}-linux-amd64.tar.gz | tar xz \
  && curl -Ls https://github.com/mozilla/sops/releases/download/${SOPS_VERSION}/sops_${SOPS_VERSION}_amd64.deb -o /sops_amd64.deb
 
-FROM mdeterman/k8-kubectl:v1.13.3
+FROM mdeterman/k8-kubectl
 
 LABEL maintainer="Mark Determan<mark@determan.io>"