diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d56652ab41da8f8e94811138559e0ea202ff3e36..98e537e6dc6f7409eea3bcfbb57b8f3dd159b267 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,6 @@ stages:
 # hard-coded to latest.
 variables:
   TAG: latest
-  CONTEXT: "$IMAGE"
 
 # Job templates:
 
@@ -72,6 +71,7 @@ build-httpd:
 push-httpd:
   extends: .push
   variables:
+    CONTEXT: httpd/buster
     IMAGE: httpd
   needs:
     - job: build-httpd
@@ -82,6 +82,7 @@ push-httpd:
 push-httpd-buster:
   extends: .push
   variables:
+    CONTEXT: httpd/buster
     IMAGE: httpd
     TAG: buster
   needs:
@@ -98,6 +99,7 @@ build-httpd-bullseye:
 push-httpd-bullseye:
   extends: .push
   variables:
+    CONTEXT: httpd/bullseye
     IMAGE: httpd
     TAG: bullseye
   needs: