diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 933aa90b4446..64ce6e8a543c 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 {
-  "image": "ghcr.io/dfinity/ic-build@sha256:fab0aadaabca3ac87408e0f09ea73190fc294058bddf215838b7f48c40abbf2f",
+  "image": "ghcr.io/dfinity/ic-build@sha256:9ff0804a8dedd979ccb6fbf83c8aeab0dc327b15cac5691c2ed61bfe91b1845f",
   "remoteUser": "ubuntu",
   "privileged": true,
   "runArgs": [
diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
index 92cdf49a7b42..60be5e19e809 100644
--- a/.github/workflows/ci-main.yml
+++ b/.github/workflows/ci-main.yml
@@ -26,7 +26,7 @@ jobs:
     runs-on: &dind-large-setup
       labels: dind-large
     container: &container-setup
-      image: ghcr.io/dfinity/ic-build@sha256:fab0aadaabca3ac87408e0f09ea73190fc294058bddf215838b7f48c40abbf2f
+      image: ghcr.io/dfinity/ic-build@sha256:9ff0804a8dedd979ccb6fbf83c8aeab0dc327b15cac5691c2ed61bfe91b1845f
       options: >-
          -e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/home/buildifier/.local/share/containers"
     timeout-minutes: 90
diff --git a/.github/workflows/ci-pr-only.yml b/.github/workflows/ci-pr-only.yml
index 3bf24a2f88bf..75d8427c14be 100644
--- a/.github/workflows/ci-pr-only.yml
+++ b/.github/workflows/ci-pr-only.yml
@@ -32,7 +32,7 @@ jobs:
     runs-on: &dind-small-setup
       labels: dind-small
     container: &container-setup
-      image: ghcr.io/dfinity/ic-build@sha256:fab0aadaabca3ac87408e0f09ea73190fc294058bddf215838b7f48c40abbf2f
+      image: ghcr.io/dfinity/ic-build@sha256:9ff0804a8dedd979ccb6fbf83c8aeab0dc327b15cac5691c2ed61bfe91b1845f
       options: >-
          -e NODE_NAME --mount type=tmpfs,target="/home/buildifier/.local/share/containers"
     steps:
diff --git a/.github/workflows/pocket-ic-tests-windows.yml b/.github/workflows/pocket-ic-tests-windows.yml
index a71786634ec1..12c9475ca58f 100644
--- a/.github/workflows/pocket-ic-tests-windows.yml
+++ b/.github/workflows/pocket-ic-tests-windows.yml
@@ -45,7 +45,7 @@ jobs:
   bazel-build-pocket-ic:
     name: Bazel Build PocketIC
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:fab0aadaabca3ac87408e0f09ea73190fc294058bddf215838b7f48c40abbf2f
+      image: ghcr.io/dfinity/ic-build@sha256:9ff0804a8dedd979ccb6fbf83c8aeab0dc327b15cac5691c2ed61bfe91b1845f
       options: >-
         -e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/home/buildifier/.local/share/containers"
     timeout-minutes: 90
diff --git a/.github/workflows/rate-limits-backend-release.yml b/.github/workflows/rate-limits-backend-release.yml
index cadac44b7b64..baa0b7c96f3b 100644
--- a/.github/workflows/rate-limits-backend-release.yml
+++ b/.github/workflows/rate-limits-backend-release.yml
@@ -32,7 +32,7 @@ jobs:
       labels: dind-large
 
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:fab0aadaabca3ac87408e0f09ea73190fc294058bddf215838b7f48c40abbf2f
+      image: ghcr.io/dfinity/ic-build@sha256:9ff0804a8dedd979ccb6fbf83c8aeab0dc327b15cac5691c2ed61bfe91b1845f
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info --mount type=tmpfs,target="/home/buildifier/.local/share/containers"
 
diff --git a/.github/workflows/release-testing.yml b/.github/workflows/release-testing.yml
index 6b35b7886860..dcd2642a125b 100644
--- a/.github/workflows/release-testing.yml
+++ b/.github/workflows/release-testing.yml
@@ -32,7 +32,7 @@ jobs:
     runs-on: &dind-large-setup
       labels: dind-large
     container: &container-setup
-      image: ghcr.io/dfinity/ic-build@sha256:fab0aadaabca3ac87408e0f09ea73190fc294058bddf215838b7f48c40abbf2f
+      image: ghcr.io/dfinity/ic-build@sha256:9ff0804a8dedd979ccb6fbf83c8aeab0dc327b15cac5691c2ed61bfe91b1845f
       options: >-
          -e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/home/buildifier/.local/share/containers"
     timeout-minutes: 180
diff --git a/.github/workflows/rosetta-release.yml b/.github/workflows/rosetta-release.yml
index 007bfd986286..13dc3a9ce966 100644
--- a/.github/workflows/rosetta-release.yml
+++ b/.github/workflows/rosetta-release.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on:
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:fab0aadaabca3ac87408e0f09ea73190fc294058bddf215838b7f48c40abbf2f
+      image: ghcr.io/dfinity/ic-build@sha256:9ff0804a8dedd979ccb6fbf83c8aeab0dc327b15cac5691c2ed61bfe91b1845f
       options: >-
         -e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/home/buildifier/.local/share/containers"
     environment: DockerHub
diff --git a/.github/workflows/salt-sharing-canister-release.yml b/.github/workflows/salt-sharing-canister-release.yml
index 309ec9c8e958..75f7794d8c57 100644
--- a/.github/workflows/salt-sharing-canister-release.yml
+++ b/.github/workflows/salt-sharing-canister-release.yml
@@ -32,7 +32,7 @@ jobs:
       labels: dind-large
 
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:fab0aadaabca3ac87408e0f09ea73190fc294058bddf215838b7f48c40abbf2f
+      image: ghcr.io/dfinity/ic-build@sha256:9ff0804a8dedd979ccb6fbf83c8aeab0dc327b15cac5691c2ed61bfe91b1845f
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info --mount type=tmpfs,target="/home/buildifier/.local/share/containers"
 
diff --git a/.github/workflows/schedule-daily.yml b/.github/workflows/schedule-daily.yml
index 86957f999f3f..c3f6e8efd5b3 100644
--- a/.github/workflows/schedule-daily.yml
+++ b/.github/workflows/schedule-daily.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: &dind-large-setup
       labels: dind-large
     container: &container-setup
-      image: ghcr.io/dfinity/ic-build@sha256:fab0aadaabca3ac87408e0f09ea73190fc294058bddf215838b7f48c40abbf2f
+      image: ghcr.io/dfinity/ic-build@sha256:9ff0804a8dedd979ccb6fbf83c8aeab0dc327b15cac5691c2ed61bfe91b1845f
       options: >-
         -e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/home/buildifier/.local/share/containers"
     timeout-minutes: 720 # 12 hours
diff --git a/.github/workflows/schedule-rust-bench.yml b/.github/workflows/schedule-rust-bench.yml
index a44f7e57b649..66ebbc8866a3 100644
--- a/.github/workflows/schedule-rust-bench.yml
+++ b/.github/workflows/schedule-rust-bench.yml
@@ -24,7 +24,7 @@ jobs:
       # see linux-x86-64 runner group
       labels: rust-benchmarks
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:fab0aadaabca3ac87408e0f09ea73190fc294058bddf215838b7f48c40abbf2f
+      image: ghcr.io/dfinity/ic-build@sha256:9ff0804a8dedd979ccb6fbf83c8aeab0dc327b15cac5691c2ed61bfe91b1845f
       # running on bare metal machine using ubuntu user
       options: --user ubuntu --mount type=tmpfs,target="/home/ubuntu/.local/share/containers"
     timeout-minutes: 720 # 12 hours
diff --git a/.github/workflows/schedule-weekly.yml b/.github/workflows/schedule-weekly.yml
index 3d9fd50cfdf8..1813eefa975c 100644
--- a/.github/workflows/schedule-weekly.yml
+++ b/.github/workflows/schedule-weekly.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on:
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:fab0aadaabca3ac87408e0f09ea73190fc294058bddf215838b7f48c40abbf2f
+      image: ghcr.io/dfinity/ic-build@sha256:9ff0804a8dedd979ccb6fbf83c8aeab0dc327b15cac5691c2ed61bfe91b1845f
       options: >-
         -e NODE_NAME --mount type=tmpfs,target="/home/buildifier/.local/share/containers"
     timeout-minutes: 60 # 1 hour
diff --git a/.github/workflows/update-mainnet-canister-revisions.yaml b/.github/workflows/update-mainnet-canister-revisions.yaml
index 1f4eca1edc84..fcaa752eae11 100644
--- a/.github/workflows/update-mainnet-canister-revisions.yaml
+++ b/.github/workflows/update-mainnet-canister-revisions.yaml
@@ -25,7 +25,7 @@ jobs:
       labels: dind-small
     environment: CREATE_PR
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:fab0aadaabca3ac87408e0f09ea73190fc294058bddf215838b7f48c40abbf2f
+      image: ghcr.io/dfinity/ic-build@sha256:9ff0804a8dedd979ccb6fbf83c8aeab0dc327b15cac5691c2ed61bfe91b1845f
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info --mount type=tmpfs,target="/home/buildifier/.local/share/containers"
     env:
diff --git a/ci/container/Dockerfile b/ci/container/Dockerfile
index 31471f0e362d..2af5d7c69103 100644
--- a/ci/container/Dockerfile
+++ b/ci/container/Dockerfile
@@ -10,15 +10,6 @@ RUN apt -yq update && \
     apt -yqq install $(sed -e "s/#.*//" "/tmp/$(basename $PACKAGE_FILE)") && \
     rm "/tmp/$(basename $PACKAGE_FILE)"
 
-# install afl & gsutils deps for bazel-fuzzers
-RUN curl -L "https://apt.llvm.org/llvm-snapshot.gpg.key" | apt-key add - && \
-    echo "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-18 main" | tee -a /etc/apt/sources.list.d/llvm.list && \
-    echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
-    curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg  add - && \
-    apt -yq update && \
-    apt -yqq install --no-install-recommends lld-18 llvm-18 llvm-18-dev clang-18 libclang-rt-18-dev google-cloud-cli \
-    gcc-$(gcc --version|head -n1|sed 's/\..*//'|sed 's/.* //')-plugin-dev libstdc++-$(gcc --version|head -n1|sed 's/\..*//'|sed 's/.* //')-dev
-
 # Install a version of google-android-platform-tools-installer with e2fsdroid
 RUN export DEBIAN_FRONTEND=noninteractive && \
     mkdir e2fsdroid && \
diff --git a/ci/container/TAG b/ci/container/TAG
index 766afebefe94..7dee8c51c606 100644
--- a/ci/container/TAG
+++ b/ci/container/TAG
@@ -1 +1 @@
-f90ae49b734a7727048d91917a4fec0fe45faf1ca64833964bb572811b705064
+2ec5dab4693efd7a81f0a02858aaea8192fc93b419ebccb700da622d56d3befe