diff --git a/Containerfile b/Containerfile
index 4bfaf00..f89430c 100644
--- a/Containerfile
+++ b/Containerfile
@@ -9,17 +9,17 @@
 # Override this repos container to control the base image package versions. For
 # example, podman build --from=quay.io/fedora/fedora:41 will get you a system
 # that uses Fedora 41 packages. Or inject arbitrary yum repos (COPR, etc) here.
+#
+# Note we also support --build-arg REPOS_IMAGE=quay.io/fedora/fedora:41 here
+# since konflux doesn't yet support --from.
 ARG REPOS_IMAGE=quay.io/fedora/fedora:rawhide
+ARG BUILDER_IMAGE=quay.io/fedora/fedora:rawhide
 FROM $REPOS_IMAGE as repos
 
-# BOOTSTRAPPING: This can be any image that has rpm-ostree and selinux-policy-targeted.
-FROM quay.io/fedora/fedora:41 as builder
-# However we also pull rpm-ostree from git main to get some fixes for now
-RUN <<EORUN
-set -xeuo pipefail
-curl -L --fail -o /etc/yum.repos.d/continuous.repo https://copr.fedorainfracloud.org/coprs/g/CoreOS/continuous/repo/fedora-41/group_CoreOS-continuous-fedora-41.repo
-dnf -y install rpm-ostree selinux-policy-targeted
-EORUN
+# BOOTSTRAPPING: This can be any image that has rpm-ostree, selinux-policy-targeted
+#                and python3 (for bootc-base-imagectl).
+FROM $BUILDER_IMAGE as builder
+RUN dnf -y install rpm-ostree selinux-policy-targeted python3
 ARG MANIFEST=fedora-standard
 # The input git repository has .repo files committed to git rpm-ostree has historically
 # emphasized that.  But here, we are fetching the repos from the container base image.