diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a3003fb..06c1c25 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,19 @@
-image: gitlab/dind
+image: docker:git
+
+services:
+- docker:dind
 
 variables:
-  REPOSITORY: registry.gitlab.com/gitlab-org/gitlab-build-images
+  DOCKER_DRIVER: overlay
+
+before_script:
+  - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" registry.gitlab.com
 
 .build_and_deploy: &build_and_deploy
   stage: build
   script:
-    - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" registry.gitlab.com
-    - docker build -t "$REPOSITORY:$CI_BUILD_NAME" -f "Dockerfile.$CI_BUILD_NAME" .
-    - docker push "$REPOSITORY:$CI_BUILD_NAME"
+    - docker build -t "$CI_REPOSITORY_IMAGE:$CI_BUILD_NAME" -f "Dockerfile.$CI_BUILD_NAME" .
+    - docker push "$CI_REPOSITORY_IMAGE:$CI_BUILD_NAME"
 
 ruby-2.1: *build_and_deploy
 ruby-2.2: *build_and_deploy