diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 54c9329..52bb706 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,19 +6,18 @@ variables:
 
 .build-image:
   stage: build
-  # For newer rpm-ostree
-  image: registry.gitlab.com/fedora/bootc/base-images-dev/fedora-bootc-dev:rawhide
+  image: quay.io/buildah/stable:v1.38.1
   needs: []
 
 build:
   extends: .build-image
   stage: build
   script: |
-    # Necessary for nested containerization
-    export BUILDAH_ISOLATION=chroot
-    podman build -f Containerfile.base --no-cache --security-opt=label=disable --cap-add=all --device /dev/fuse -t ${IMAGE_PREFIX}-base:tmp .
+    set -xeuo pipefail
+    curl -L --fail -o /etc/yum.repos.d/coreos-continuous.repo https://copr.fedorainfracloud.org/coprs/g/CoreOS/continuous/repo/fedora-42/group_CoreOS-continuous-fedora-42.repo
+    dnf -y install rpm-ostree
+    buildah build "${hostbuildopts[@]}" -f Containerfile.base --no-cache --security-opt=label=disable --cap-add=all --device /dev/fuse -t ${IMAGE_PREFIX}-base:tmp .
+    # Rechunk
     rpm-ostree experimental compose build-chunked-oci --bootc --format-version=1 \
            --from=${IMAGE_PREFIX}-base:tmp --output containers-storage:${IMAGE_PREFIX}-base
-    podman build -f Containerfile --no-cache --from ${IMAGE_PREFIX}-base -t ${IMAGE_PREFIX}-standard:tmp .
-    rpm-ostree experimental compose build-chunked-oci --bootc --format-version=1 \
-           --from=${IMAGE_PREFIX}-standard:tmp --output containers-storage:${IMAGE_PREFIX}-standard
+    buildah build "${hostbuildopts[@]}" -f Containerfile --no-cache --from ${IMAGE_PREFIX}-base -t ${IMAGE_PREFIX}-standard:tmp .