diff --git a/.gitlab-ci.jsonnet b/.gitlab-ci.jsonnet
index ba718ff65de4f29d1c907370028812e587750fba..51452d07fc974a68480d8d5ceda09e46bb359702 100644
--- a/.gitlab-ci.jsonnet
+++ b/.gitlab-ci.jsonnet
@@ -1,11 +1,12 @@
+local dockerfile_name(image) = if image == "" then "Dockerfile" else "Dockerfile." + image; 
 local param_cmd(image) = {
         cmd: |||
             /kaniko/executor
             --context ${CI_PROJECT_DIR}
-            --dockerfile "${CI_PROJECT_DIR}/Dockerfile"
+            --dockerfile "${CI_PROJECT_DIR}/%(df)s"
             --destination "${CI_REGISTRY_IMAGE}/%(img)s:${CI_COMMIT_SHORT_SHA}"
             --destination "${CI_REGISTRY_IMAGE}/%(img)s:latest"
-        ||| % {img: image},
+        ||| % {img: image, df: dockerfile_name(df)},
 };
 local param_job(image, depends=[]) = {
     stage: 'build',
@@ -21,5 +22,8 @@ local param_job(image, depends=[]) = {
     ]
   };
 {
-  "heimdall": param_job("heimdall",[]),
+  "bor": param_job("",[]),
+  "alltools": param_job("alltools",[]),
+  "classic": param_job("classic",[]),
+  "release": param_job("release",[]),
 }