diff --git a/gitlab-ci-template.yml b/gitlab-ci-template.yml
index 55a0a83e2fa0a22c64cd16301224e52e55752a36..85ee3b704980531845f21a73c8cfee6db4ad752c 100644
--- a/gitlab-ci-template.yml
+++ b/gitlab-ci-template.yml
@@ -3,10 +3,12 @@ stages:
   - tag
 
 variables:
-  CI_REGISTRY_BUILD_ARGS: "--format docker"
+  CI_REGISTRY_BUILD_ARGS: ""
 
 container-build:
   stage: build
+  variables:
+    CI_REGISTRY_CONTAINER_FORMAT: "docker"
   inherit:
     default: false
     variables:
@@ -24,7 +26,7 @@ container-build:
     - export VCS_URL=$CI_PROJECT_URL
   script:
     - si-fix "${CI_REGISTRY_BUILD_DOCKERFILE:-./Dockerfile}"
-    - podman build --pull
+    - podman build --pull --format "$CI_REGISTRY_CONTAINER_FORMAT"
       --label "org.opencontainers.image.source=$CI_PROJECT_URL"
       --label "org.opencontainers.image.revision=$CI_COMMIT_SHA"
       --label "org.opencontainers.image.created=$(date --rfc-3339 ns)"