diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 247914a3ca35b0f4e1a1466faee0123d3a80c062..454e2eac3067ea845d14e205f57dfde0935b2948 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,15 +21,15 @@ build-container-image:
   interruptible: true
   rules:
     - if: $CI_COMMIT_BRANCH
-  tags:
-    - shell
+  image: quay.io/buildah/stable:v1
+  variables:
+    STORAGE_DRIVER: vfs
+    BUILDAH_ISOLATION: chroot
   before_script:
-    - REGISTRY_AUTH_FILE="$(mktemp)"
-    - export REGISTRY_AUTH_FILE
-    - printf '{"auths":{"%s":{"auth":"%s"}}}' "$CI_REGISTRY" "$(printf '%s:%s' "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64)" >"$REGISTRY_AUTH_FILE"
+    - buildah login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
   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"
+    - buildah build -f "$CI_PROJECT_DIR/bootc/Containerfile" -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHA" "$CI_PROJECT_DIR"
+    - buildah push "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHA"
   needs: [ ]
 
 tag-container-image: