diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f18b6ebddec7277e2ad7705b52a2e075bb7ffb0d..53a75a8222dd080d18eb8436dff85a38b3a65e46 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,23 +1,15 @@
-variables:
-  # Commit of ghc/ci-images repository from which to pull Docker images
-  DOCKER_REV: 885dfba7f74583d6a394dbf711cc805178cfcc47
-
 stages:
   - build
   - full-build
 
 hadrian-ghc-in-ghci:
   stage: build
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
-
   tags: ["lint"]
   script:
     - "false"
 
 build:
   stage: full-build
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
-
   tags: ["lint"]
   "needs": [
       {
@@ -28,7 +20,7 @@ build:
   "rules": [
       {
         "if": "(\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
-        "when": "always"
+        "when": "on_success"
       }
   ]
   script: