diff --git a/ansible/roles/baselayout/tasks/partials/postinstall/rhel.yml b/ansible/roles/baselayout/tasks/partials/postinstall/rhel.yml
index 400ed7a0b..917753650 100644
--- a/ansible/roles/baselayout/tasks/partials/postinstall/rhel.yml
+++ b/ansible/roles/baselayout/tasks/partials/postinstall/rhel.yml
@@ -51,6 +51,7 @@
       - lld-{{rhel_llvm_version}}
       - lld-libs-{{rhel_llvm_version}}
       - llvm-{{rhel_llvm_version}}
+      - llvm-filesystem-{{rhel_llvm_version}}
       - llvm-libs-{{rhel_llvm_version}}
       - llvm-toolset-{{rhel_llvm_version}}
       - rust-{{rhel_rust_version}}
diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml
index 74d7b32b0..01a6eaef9 100644
--- a/ansible/roles/baselayout/vars/main.yml
+++ b/ansible/roles/baselayout/vars/main.yml
@@ -7,9 +7,12 @@
 git_no_binpkg: [ ]
 git_version: 2.10.2
 
-# toolchain versions
-rhel_llvm_version: 19.1.7
-rhel_rust_version: 1.84.1
+# Toolchain versions.
+# If changing the RHEL versions, you may need to run `dnf versionlock clear`
+# before running the playbook to undo previous version locking in
+# ansible\roles\baselayout\tasks\partials\postinstall\rhel.yml.
+rhel_llvm_version: 20.1.8
+rhel_rust_version: 1.88.0
 
 ssh_config: /etc/ssh/sshd_config
 
diff --git a/ansible/roles/docker/templates/rhel8.Dockerfile.j2 b/ansible/roles/docker/templates/rhel8.Dockerfile.j2
index 4a20f6b6f..c89081f23 100644
--- a/ansible/roles/docker/templates/rhel8.Dockerfile.j2
+++ b/ansible/roles/docker/templates/rhel8.Dockerfile.j2
@@ -28,13 +28,13 @@ RUN . /secrets.txt \
       gcc-toolset-12 \
       gcc-toolset-14-libatomic-devel \
       git \
-      java-17-openjdk-headless \
-      llvm-toolset-19.1.7 \
+      java-21-openjdk-headless \
+      llvm-toolset-20.1.8 \
       make \
       python3.12 \
       python3.12-pip \
       procps-ng \
-      rust-toolset-1.84.1 \
+      rust-toolset-1.88.0 \
       xz \
     && dnf clean all \
     && subscription-manager unregister
diff --git a/ansible/roles/docker/templates/ubi81.Dockerfile.j2 b/ansible/roles/docker/templates/ubi81.Dockerfile.j2
index 00fe5e1dc..7ea421c03 100644
--- a/ansible/roles/docker/templates/ubi81.Dockerfile.j2
+++ b/ansible/roles/docker/templates/ubi81.Dockerfile.j2
@@ -28,14 +28,14 @@ RUN chmod u+x /secrets.txt && . /secrets.txt \
       gcc-toolset-12 \
       gcc-toolset-14-libatomic-devel \
       git \
-      java-17-openjdk-headless \
-      llvm-toolset-19.1.7 \
+      java-21-openjdk-headless \
+      llvm-toolset-20.1.8 \
       make \
       python3.12 \
       python3.12-pip \
       openssl-devel \
       procps-ng \
-      rust-toolset-1.84.1 \
+      rust-toolset-1.88.0 \
     && dnf clean all \
     && subscription-manager unregister