diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0421a4f67..ae0c09c1c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,19 +26,19 @@ black_lint:
   except:
     - master
 
-#build_test_image:  # Currently hangs forever, because of GitLab Runner infrastructure issues
-#  stage: build-test-image
-#  image:
-#    name: gcr.io/kaniko-project/executor:debug
-#    entrypoint: [""]
-#  script:
-#    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-#    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/tools/Dockerfile-test --destination $CI_REGISTRY_IMAGE:test
-#  only:
-#    refs:
-#      - master
-#    changes:
-#      - tools/
+build_test_image:
+  stage: build-test-image
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
+  script:
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/tools/Dockerfile-test --destination $CI_REGISTRY_IMAGE:test
+  only:
+    refs:
+      - master
+    changes:
+      - tools/
 
 .tox_includes: &tox_includes
   stage: test
@@ -103,3 +103,14 @@ deploy:
     - twine upload --skip-existing -u $TWINE_USERNAME -p $TWINE_PASSWORD dist/*
   only:
     - tags
+
+deploy_image:
+  stage: deploy
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
+  script:
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
+  only:
+    - tags
diff --git a/README.rst b/README.rst
index a7909fa03..78f5e41f4 100644
--- a/README.rst
+++ b/README.rst
@@ -55,8 +55,11 @@ How to use
 
 ``docker run -it --rm -e GITLAB_PRIVATE_TOKEN=<your token> -v /path/to/python-gitlab.cfg:/python-gitlab.cfg python-gitlab <command> ...``
 
-To change the GitLab URL, use `-e GITLAB_URL=<your url>`
+or run it directly from the upstream image:
+
+``docker run -it --rm -e GITLAB_PRIVATE_TOKEN=<your token> -v /path/to/python-gitlab.cfg:/python-gitlab.cfg registry.gitlab.com/python-gitlab/python-gitlab:v1.8.0 <command> ...``
 
+To change the GitLab URL, use `-e GITLAB_URL=<your url>`
 
 Bring your own config file:
 ``docker run -it --rm -v /path/to/python-gitlab.cfg:/python-gitlab.cfg -e GITLAB_CFG=/python-gitlab.cfg python-gitlab <command> ...``
diff --git a/tools/Dockerfile-test b/tools/Dockerfile-test
index 7d491de7f..68ef467ed 100644
--- a/tools/Dockerfile-test
+++ b/tools/Dockerfile-test
@@ -11,7 +11,7 @@ RUN apt-get update \
       tzdata \
     && curl https://packages.gitlab.com/install/repositories/gitlab/gitlab-ce/script.deb.sh | bash \
     && apt-get install -qy --no-install-recommends \
-      gitlab-ce=11.10.0-ce.0
+      gitlab-ce=11.11.2-ce.0
 
 # Manage SSHD through runit
 RUN mkdir -p /opt/gitlab/sv/sshd/supervise \
diff --git a/tools/build_test_env.sh b/tools/build_test_env.sh
index 3185f72ce..624f87908 100755
--- a/tools/build_test_env.sh
+++ b/tools/build_test_env.sh
@@ -77,7 +77,7 @@ cleanup() {
 }
 
 try docker run --name gitlab-test --detach --publish 8080:80 \
-    --publish 2222:22 pythongitlab/test-python-gitlab:latest >/dev/null
+    --publish 2222:22 registry.gitlab.com/python-gitlab/python-gitlab:test >/dev/null
 
 LOGIN='root'
 PASSWORD='5iveL!fe'