diff --git a/install-dependencies.sh b/install-dependencies.sh
index 66a47446cf..a2b9c25641 100755
--- a/install-dependencies.sh
+++ b/install-dependencies.sh
@@ -132,6 +132,9 @@ fedora_packages=(
     fipscheck
     cpp-jwt-devel
 
+    podman
+    buildah
+
     https://github.com/scylladb/cassandra-stress/releases/download/v3.17.5/cassandra-stress-3.17.5-1.noarch.rpm
 )
 
diff --git a/tools/toolchain/Dockerfile b/tools/toolchain/Dockerfile
index 3d8d11b5cd..1cfc3df0d0 100644
--- a/tools/toolchain/Dockerfile
+++ b/tools/toolchain/Dockerfile
@@ -4,6 +4,7 @@ ARG CLANG_BUILD="SKIP"
 ARG CLANG_ARCHIVES
 
 WORKDIR /mnt
+RUN echo install_weak_deps=False >> /etc/dnf/dnf.conf
 RUN dnf -y update \
     && dnf -y install 'dnf-command(copr)' \
     && dnf -y install ccache \
diff --git a/tools/toolchain/dbuild b/tools/toolchain/dbuild
index ebdd0df23a..5fabe6b1e5 100755
--- a/tools/toolchain/dbuild
+++ b/tools/toolchain/dbuild
@@ -32,6 +32,7 @@ here="$(realpath $(dirname "$0"))"
 toplevel="$(realpath "$here/../..")"
 group_args=()
 docker_args=()
+tmpfiles=()
 image="$(<"$here/image")"
 
 for gid in $(id -G); do
@@ -161,8 +162,22 @@ else
     # --pids-limit is not supported on podman with cgroupsv1
     # detection code from
     #   https://unix.stackexchange.com/questions/617764/how-do-i-check-if-system-is-using-cgroupv1
+    containers_conf="$(mktemp)"
+    tmpfiles+=("$containers_conf")
+    cat > "$containers_conf" <<EOF
+[engine]
+static_dir = "$HOME/.local/share/containers/storage/libpod"
+volume_path = "$HOME/.local/share/containers/storage/libpod"
+
+[containers]
+# netns = private, the default, doesn't work in nested containers,
+# and we don't mind using the host network anyway.
+netns = "host"
+EOF
     if grep -q 'cgroup2.*/sys/fs/cgroup ' /proc/mounts; then
         docker_common_args+=(
+            -v "$HOME/.local/share/containers:$HOME/.local/share/containers"
+            -v "$containers_conf:/etc/containers/containers.conf.d/nested.conf"
             --pids-limit -1
             --annotation run.oci.keep_original_groups=1
         )
@@ -222,6 +237,7 @@ cleanup() {
     if [ -v TMP_PASSWD ]; then
         rm -f "$TMP_PASSWD"
     fi
+    rm -f "${tmpfiles[@]}"
 }
 
 if [[ -n "$interactive" || -n "$is_podman" ]]; then
diff --git a/tools/toolchain/image b/tools/toolchain/image
index c1855aa3e0..7a1157c29f 100644
--- a/tools/toolchain/image
+++ b/tools/toolchain/image
@@ -1 +1 @@
-docker.io/scylladb/scylla-toolchain:fedora-41-20250410
+docker.io/scylladb/scylla-toolchain:fedora-41-20250505