diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f130637fc3b215aa92364ed70bf594fee2f74d8..f83587a61d86b126699f8de514a9ba2f4ee9d88c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,12 +62,12 @@ push-cgit:
     - job: build-cgit
       artifacts: true
 
-# httpd image:
+# httpd latest image:
 
 build-httpd:
   extends: .build
   variables:
-    CONTEXT: httpd
+    CONTEXT: httpd/buster
 
 push-httpd:
   extends: .push
@@ -76,3 +76,14 @@ push-httpd:
   needs:
     - job: build-httpd
       artifacts: true
+
+# httpd buster image:
+
+push-httpd-buster:
+  extends: .push
+  variables:
+    IMAGE: httpd
+    TAG: buster
+  needs:
+    - job: build-httpd
+      artifacts: true
diff --git a/httpd/.dockerignore b/httpd/buster/.dockerignore
similarity index 100%
rename from httpd/.dockerignore
rename to httpd/buster/.dockerignore
diff --git a/httpd/Dockerfile b/httpd/buster/Dockerfile
similarity index 100%
rename from httpd/Dockerfile
rename to httpd/buster/Dockerfile