diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cbcf011..d00bc83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,22 +1,15 @@
-image: docker:latest
+image: gitlab/dind
 
 variables:
-  REPOSITORY: gitlab/gitlab-build-images
-
-services:
-  - docker:dind
+  REPOSITORY: registry.gitlab.com/gitlab-org/gitlab-build-images
 
 .build_and_deploy: &build_and_deploy
   stage: build
   script:
-    - docker login -u "$DOCKER_LOGIN" -p "$DOCKER_PASSWORD"
+    - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN"
     - docker build -t "$REPOSITORY/$CI_BUILD_NAME" -f "Dockerfile.$CI_BUILD_NAME" .
     - docker push "$REPOSITORY/$CI_BUILD_NAME"
 
-omnibus-debian-jessie: *build_and_deploy
-omnibus-debian-wheezy: *build_and_deploy
-omnibus-raspbian-jessie: *build_and_deploy
-omnibus-raspbian-wheezy: *build_and_deploy
 ruby-2.1: *build_and_deploy
 ruby-2.2: *build_and_deploy
 ruby-2.3: *build_and_deploy