diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 830a26d..f7abfc9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,14 +7,14 @@ variables:
   DOCKER_DRIVER: overlay
 
 before_script:
-  - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" "$CI_REGISTRY"
+  - docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" "$CI_REGISTRY"
 
 .test_build: &test_build
   stage: test
   script:
     # Hack to set an array in /bin/sh
     # http://unix.stackexchange.com/a/137571
-    - set -- $CI_BUILD_NAME
+    - set -- $CI_JOB_NAME
     - docker build -f "Dockerfile.$1" .
   except:
     - master
@@ -22,8 +22,8 @@ before_script:
 .build_and_deploy: &build_and_deploy
   stage: build
   script:
-    - docker build -t "$CI_REGISTRY_IMAGE:$CI_BUILD_NAME" -f "Dockerfile.$CI_BUILD_NAME" .
-    - docker push "$CI_REGISTRY_IMAGE:$CI_BUILD_NAME"
+    - docker build -t "$CI_REGISTRY_IMAGE:$CI_JOB_NAME" -f "Dockerfile.$CI_BUILD_NAME" .
+    - docker push "$CI_REGISTRY_IMAGE:$CI_JOB_NAME"
   only:
     - master