diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a94e2b44cc43c3aee757a7935c4ab7a798dc62ae..e27b17c1ae9fc54d2220d23cefff76fb0940ff96 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,12 +4,6 @@ stages:
   - release
 
 include:
-  - component: $CI_SERVER_FQDN/its/templates-and-utilities/gitlab-ci-components/build-container-image/build-container-image@1
-    inputs:
-      containerfile: $CI_PROJECT_DIR/bootc/Containerfile
-      context: $CI_PROJECT_DIR
-      image: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
-
   - component: $CI_SERVER_FQDN/its/templates-and-utilities/gitlab-ci-components/simple-release/simple-release@1
     inputs:
       component-version: "1"
@@ -23,10 +17,21 @@ include:
       tag: $CI_COMMIT_TAG
 
 build-container-image:
+  stage: build
+  interruptible: true
   rules:
     - if: $CI_COMMIT_BRANCH
   tags:
-    - privileged
+    - shell
+  before_script:
+    - REGISTRY_AUTH_FILE="$(mktemp)"
+    - trap 'rm "$REGISTRY_AUTH_FILE" && printf "Removed \$REGISTRY_AUTH_FILE\n"' EXIT
+    - export REGISTRY_AUTH_FILE
+    - printf '{"auths":{"%s":{"auth":"%s"}}}' "$CI_REGISTRY" "$(printf '%s:%s' "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64)" >"$REGISTRY_AUTH_FILE"
+  script:
+    - podman build -f "$CI_PROJECT_DIR/bootc/Containerfile" -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHA" "$CI_PROJECT_DIR"
+    - podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHA"
+  needs: [ ]
 
 tag-container-image:
   rules: