diff --git a/benchmarks/harfbuzz_hb-shape-fuzzer_17863b/build.sh b/benchmarks/harfbuzz_hb-shape-fuzzer_17863b/build.sh
index 5f079bbb7..4dd700141 100644
--- a/benchmarks/harfbuzz_hb-shape-fuzzer_17863b/build.sh
+++ b/benchmarks/harfbuzz_hb-shape-fuzzer_17863b/build.sh
@@ -25,8 +25,8 @@ python3.8 -m pip install ninja meson==0.56.0
 
 # Disable:
 # 1. UBSan vptr since target built with -fno-rtti.
-export CFLAGS="$CFLAGS -fno-sanitize=vptr -DHB_NO_VISIBILITY"
-export CXXFLAGS="$CXXFLAGS -fno-sanitize=vptr -DHB_NO_VISIBILITY"
+export CFLAGS="$CFLAGS -fno-sanitize=vptr -DHB_NO_VISIBILITY -DHB_NO_PRAGMA_GCC_DIAGNOSTIC -Wno-cast-function-type-strict -Wno-incompatible-function-pointer-types-strict"
+export CXXFLAGS="$CXXFLAGS -fno-sanitize=vptr -DHB_NO_VISIBILITY -DHB_NO_PRAGMA_GCC_DIAGNOSTIC -Wno-cast-function-type-strict -Wno-incompatible-function-pointer-types-strict"
 
 # setup
 build=$WORK/build
diff --git a/fuzzers/aflrustrust/builder.Dockerfile b/fuzzers/aflrustrust/builder.Dockerfile
deleted file mode 100644
index ccc7afc4f..000000000
--- a/fuzzers/aflrustrust/builder.Dockerfile
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-ARG parent_image
-FROM $parent_image
-
-# Install dependencies.
-RUN apt-get update && \
-    apt-get install -y build-essential libstdc++5 libtool-bin automake flex \
-        bison libglib2.0-dev python3-setuptools unzip python3-dev joe curl \
-        cmake git apt-utils apt-transport-https ca-certificates libdbus-1-dev
-
-# Uninstall old Rust & Install the latest one.
-RUN if which rustup; then rustup self uninstall -y; fi && \
-    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /rustup.sh && \
-    sh /rustup.sh --default-toolchain nightly-2023-09-21 -y && \
-    rm /rustup.sh
-
-# Download afl++.
-RUN git clone https://github.com/AFLplusplus/AFLplusplus /afl
-
-# Checkout a current commit
-RUN cd /afl && git checkout 8cdc48f73a17ddd557897f2098937a8ba3bfe184
-
-# Build without Python support as we don't need it.
-# Set AFL_NO_X86 to skip flaky tests.
-RUN cd /afl && \
-    unset CFLAGS CXXFLAGS && \
-    export CC=clang AFL_NO_X86=1 && \
-    PYTHON_INCLUDE=/ make && \
-    make install && \
-    cp utils/aflpp_driver/libAFLDriver.a /
-
-# Download libafl.
-RUN git clone https://github.com/AFLplusplus/LibAFL /libafl
-
-# Checkout a current commit
-RUN cd /libafl && git checkout c103444396697af102dce2b936a00e93017057ba
-
-# Compile libafl.
-RUN cd /libafl && \
-    unset CFLAGS CXXFLAGS && \
-    cd ./fuzzers/fuzzbench_forkserver && \
-    PATH="/root/.cargo/bin/:$PATH" cargo build --profile release-fuzzbench
-
diff --git a/fuzzers/aflrustrust/description.md b/fuzzers/aflrustrust/description.md
deleted file mode 100644
index 445a27663..000000000
--- a/fuzzers/aflrustrust/description.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# aflplusplus
-
-AFL++ fuzzer instance that has the following config active for all benchmarks:
-  - PCGUARD instrumentation 
-  - cmplog feature
-  - "fast" power schedule
-  - persistent mode + shared memory test cases
-
-Repository: [https://github.com/AFLplusplus/AFLplusplus/](https://github.com/AFLplusplus/AFLplusplus/)
-
-[builder.Dockerfile](builder.Dockerfile)
-[fuzzer.py](fuzzer.py)
-[runner.Dockerfile](runner.Dockerfile)
diff --git a/fuzzers/aflrustrust/fuzzer.py b/fuzzers/aflrustrust/fuzzer.py
deleted file mode 100755
index 81cc4b2f2..000000000
--- a/fuzzers/aflrustrust/fuzzer.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-"""Integration code for a LibAFL fuzzer with an AFL++ forkserver."""
-
-import os
-import shutil
-import subprocess
-
-from fuzzers import utils
-from fuzzers.aflplusplus import fuzzer as aflplusplus_fuzzer
-from fuzzers.libafl import fuzzer as libafl_fuzzer
-
-
-def build():
-    """Build benchmark."""
-    # Build the target with AFL++
-    aflplusplus_fuzzer.build('tracepc', 'cmplog', 'dict2file')
-
-    # Copy to fuzzer to OUT
-    build_directory = os.environ['OUT']
-    fuzzer = '/libafl/fuzzers/fuzzbench_forkserver/' \
-              'target/release-fuzzbench/fuzzbench_forkserver'
-    shutil.copy(fuzzer, build_directory)
-
-
-def fuzz(input_corpus, output_corpus, target_binary):
-    """Run fuzzer."""
-    # Calculate CmpLog binary path from the instrumented target binary.
-    target_binary_directory = os.path.dirname(target_binary)
-    cmplog_target_binary_directory = \
-        aflplusplus_fuzzer.get_cmplog_build_directory(target_binary_directory)
-    target_binary_name = os.path.basename(target_binary)
-    cmplog_target_binary = os.path.join(cmplog_target_binary_directory,
-                                        target_binary_name)
-
-    # Setup env vars
-    libafl_fuzzer.prepare_fuzz_environment(input_corpus)
-
-    # Merge dictionaries
-    dictionary_path = utils.get_dictionary_path(target_binary)
-    if os.path.exists('./afl++.dict'):
-        if dictionary_path:
-            with open('./afl++.dict', encoding='utf-8') as dictfile:
-                autodict = dictfile.read()
-            with open(dictionary_path, 'a', encoding='utf-8') as dictfile:
-                dictfile.write(autodict)
-        else:
-            dictionary_path = './afl++.dict'
-
-    # Run the fuzzer
-    command = ['./fuzzbench_forkserver', '-c', cmplog_target_binary]
-    if dictionary_path:
-        command += (['-x', dictionary_path])
-    command += (['-o', output_corpus, '-i', input_corpus, target_binary])
-    print(command)
-    subprocess.check_call(command)
diff --git a/fuzzers/aflrustrust/runner.Dockerfile b/fuzzers/aflrustrust/runner.Dockerfile
deleted file mode 100644
index 7aa1da8e4..000000000
--- a/fuzzers/aflrustrust/runner.Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM gcr.io/fuzzbench/base-image
-
-# This makes interactive docker runs painless:
-ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/out"
-#ENV AFL_MAP_SIZE=2621440
-ENV PATH="$PATH:/out"
-ENV AFL_SKIP_CPUFREQ=1
-ENV AFL_I_DONT_CARE_ABOUT_MISSING_CRASHES=1
-ENV AFL_TESTCACHE_SIZE=2
diff --git a/fuzzers/libafl/builder.Dockerfile b/fuzzers/libafl/builder.Dockerfile
index 3f726cfec..7fd7462a7 100644
--- a/fuzzers/libafl/builder.Dockerfile
+++ b/fuzzers/libafl/builder.Dockerfile
@@ -18,7 +18,7 @@ FROM $parent_image
 # Uninstall old Rust & Install the latest one.
 RUN if which rustup; then rustup self uninstall -y; fi && \
     curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /rustup.sh && \
-    sh /rustup.sh --default-toolchain nightly-2023-09-21 -y && \
+    sh /rustup.sh --default-toolchain nightly-2024-08-12 -y && \
     rm /rustup.sh
 
 # Install dependencies.
@@ -34,27 +34,21 @@ RUN apt-get update && \
 
 RUN wget https://gist.githubusercontent.com/tokatoka/26f4ba95991c6e33139999976332aa8e/raw/698ac2087d58ce5c7a6ad59adce58dbfdc32bd46/createAliases.sh && chmod u+x ./createAliases.sh && ./createAliases.sh 
 
-# Uninstall old Rust & Install the latest one.
-RUN if which rustup; then rustup self uninstall -y; fi && \
-    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /rustup.sh && \
-    sh /rustup.sh --default-toolchain nightly-2024-03-12 -y && \
-    rm /rustup.sh
-
 # Download libafl.
 RUN git clone https://github.com/AFLplusplus/LibAFL /libafl
 
 # Checkout a current commit
-RUN cd /libafl && git pull && git checkout b4efb6151550a37f61a869acf2957a1b07894a93 || true
+RUN cd /libafl && git pull && git checkout f3433767bea0cc3d7ee3b4c08be138e61d20c468 || true
 # Note that due a nightly bug it is currently fixed to a known version on top!
 
 # Compile libafl.
 RUN cd /libafl && \
     unset CFLAGS CXXFLAGS && \
     export LIBAFL_EDGES_MAP_SIZE=2621440 && \
-    cd ./fuzzers/fuzzbench && \
+    cd ./fuzzers/fuzzbench/fuzzbench && \
     PATH="/root/.cargo/bin/:$PATH" cargo build --profile release-fuzzbench --features no_link_main
 
 # Auxiliary weak references.
-RUN cd /libafl/fuzzers/fuzzbench && \
+RUN cd /libafl/fuzzers/fuzzbench/fuzzbench && \
     clang -c stub_rt.c && \
     ar r /stub_rt.a stub_rt.o
diff --git a/fuzzers/libafl/fuzzer.py b/fuzzers/libafl/fuzzer.py
index 0f191a744..b7f28d5af 100755
--- a/fuzzers/libafl/fuzzer.py
+++ b/fuzzers/libafl/fuzzer.py
@@ -40,10 +40,10 @@ def prepare_fuzz_environment(input_corpus):
 
 def build():  # pylint: disable=too-many-branches,too-many-statements
     """Build benchmark."""
-    os.environ[
-        'CC'] = '/libafl/fuzzers/fuzzbench/target/release-fuzzbench/libafl_cc'
-    os.environ[
-        'CXX'] = '/libafl/fuzzers/fuzzbench/target/release-fuzzbench/libafl_cxx'
+    os.environ['CC'] = ('/libafl/fuzzers/fuzzbench/fuzzbench'
+                        '/target/release-fuzzbench/libafl_cc')
+    os.environ['CXX'] = ('/libafl/fuzzers/fuzzbench/fuzzbench'
+                         '/target/release-fuzzbench/libafl_cxx')
 
     os.environ['ASAN_OPTIONS'] = 'abort_on_error=0:allocator_may_return_null=1'
     os.environ['UBSAN_OPTIONS'] = 'abort_on_error=0'
diff --git a/fuzzers/libafl_libfuzzer/builder.Dockerfile b/fuzzers/libafl_libfuzzer/builder.Dockerfile
index 24dbb83c0..f166158a3 100644
--- a/fuzzers/libafl_libfuzzer/builder.Dockerfile
+++ b/fuzzers/libafl_libfuzzer/builder.Dockerfile
@@ -28,15 +28,15 @@ RUN apt-get update && \
 # Uninstall old Rust & Install the latest one.
 RUN if which rustup; then rustup self uninstall -y; fi && \
     curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /rustup.sh && \
-    sh /rustup.sh --default-toolchain nightly-2023-08-23 -y && \
+    sh /rustup.sh --default-toolchain nightly-2024-08-12 -y && \
     rm /rustup.sh
 
 # Download libafl.
 RUN git clone https://github.com/AFLplusplus/libafl /libafl && \
     cd /libafl && \
-    git checkout defe9084aed5a80ac32fe9a1f3ff00baf97738c6 && \
+    git checkout f3433767bea0cc3d7ee3b4c08be138e61d20c468 && \
     unset CFLAGS CXXFLAGS && \
     export LIBAFL_EDGES_MAP_SIZE=2621440 && \
-    cd ./libafl_libfuzzer/libafl_libfuzzer_runtime && \
+    cd ./libafl_libfuzzer_runtime && \
     env -i CXX=$CXX CC=$CC PATH="/root/.cargo/bin/:$PATH" cargo build --profile release-fuzzbench && \
     cp ./target/release-fuzzbench/libafl_libfuzzer_runtime.a /usr/lib/libFuzzer.a
diff --git a/fuzzers/libafl_text/builder.Dockerfile b/fuzzers/libafl_text/builder.Dockerfile
deleted file mode 100644
index 37d1456d5..000000000
--- a/fuzzers/libafl_text/builder.Dockerfile
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-ARG parent_image
-FROM $parent_image
-
-# Uninstall old Rust & Install the latest one.
-RUN if which rustup; then rustup self uninstall -y; fi && \
-    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /rustup.sh && \
-    sh /rustup.sh --default-toolchain nightly -y && \
-    rm /rustup.sh
-
-# Install dependencies.
-RUN apt-get update && \
-    apt-get remove -y llvm-10 && \
-    apt-get install -y \
-        build-essential \
-        llvm-11 \
-        clang-12 \
-        cargo && \
-    apt-get install -y wget libstdc++5 libtool-bin automake flex bison \
-        libglib2.0-dev libpixman-1-dev python3-setuptools unzip \
-        apt-utils apt-transport-https ca-certificates joe curl && \
-    PATH="/root/.cargo/bin/:$PATH" cargo install cargo-make
-
-# Download libafl.
-RUN git clone \
-        --branch vhtokens \
-        https://github.com/AFLplusplus/libafl /libafl && \
-        cd /libafl && \
-        git checkout 6c7f6566b0c8b3b82352c052a0672f46a2f7d1e9 || \
-        true
-
-# Compile libafl.
-RUN cd /libafl && \
-    unset CFLAGS CXXFLAGS && \
-    export LIBAFL_EDGES_MAP_SIZE=2621440 && \
-    cd ./fuzzers/fuzzbench_text && \
-    PATH="/root/.cargo/bin/:$PATH" cargo build --release
-
-# Auxiliary weak references.
-RUN wget https://gist.githubusercontent.com/andreafioraldi/e5f60d68c98b31665a274207cfd05541/raw/4da351a321f1408df566a9cf2ce7cde6eeab3904/empty_fuzzer_lib.c -O /empty_fuzzer_lib.c && \
-    clang -c /empty_fuzzer_lib.c && \
-    ar r /emptylib.a *.o
diff --git a/fuzzers/libafl_text/description.md b/fuzzers/libafl_text/description.md
deleted file mode 100644
index ea9b947d6..000000000
--- a/fuzzers/libafl_text/description.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# libafl
-
-libafl fuzzer instance 
-  - cmplog feature
-  - persistent mode
-
-Repository: [https://github.com/AFLplusplus/libafl/](https://github.com/AFLplusplus/libafl/)
-
-[builder.Dockerfile](builder.Dockerfile)
-[fuzzer.py](fuzzer.py)
-[runner.Dockerfile](runner.Dockerfile)
diff --git a/fuzzers/libafl_text/fuzzer.py b/fuzzers/libafl_text/fuzzer.py
deleted file mode 100755
index 79b52a7c4..000000000
--- a/fuzzers/libafl_text/fuzzer.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-"""Integration code for a LibAFL-based fuzzer."""
-
-import os
-import subprocess
-
-from fuzzers import utils
-
-
-def prepare_fuzz_environment(input_corpus):
-    """Prepare to fuzz with a LibAFL-based fuzzer."""
-    os.environ['ASAN_OPTIONS'] = 'abort_on_error=1:detect_leaks=0:'\
-                                 'malloc_context_size=0:symbolize=0:'\
-                                 'allocator_may_return_null=1:'\
-                                 'detect_odr_violation=0:handle_segv=0:'\
-                                 'handle_sigbus=0:handle_abort=0:'\
-                                 'handle_sigfpe=0:handle_sigill=0'
-    os.environ['UBSAN_OPTIONS'] =  'abort_on_error=1:'\
-                                   'allocator_release_to_os_interval_ms=500:'\
-                                   'handle_abort=0:handle_segv=0:'\
-                                   'handle_sigbus=0:handle_sigfpe=0:'\
-                                   'handle_sigill=0:print_stacktrace=0:'\
-                                   'symbolize=0:symbolize_inline_frames=0'
-    # Create at least one non-empty seed to start.
-    utils.create_seed_file_for_empty_corpus(input_corpus)
-
-
-def build():  # pylint: disable=too-many-branches,too-many-statements
-    """Build benchmark."""
-    os.environ['CC'] = '/libafl/fuzzers/fuzzbench_text/target/release/libafl_cc'
-    os.environ[
-        'CXX'] = '/libafl/fuzzers/fuzzbench_text/target/release/libafl_cxx'
-
-    os.environ['ASAN_OPTIONS'] = 'abort_on_error=0:allocator_may_return_null=1'
-    os.environ['UBSAN_OPTIONS'] = 'abort_on_error=0'
-
-    cflags = ['--libafl']
-    utils.append_flags('CFLAGS', cflags)
-    utils.append_flags('CXXFLAGS', cflags)
-    utils.append_flags('LDFLAGS', cflags)
-
-    os.environ['FUZZER_LIB'] = '/emptylib.a'
-    utils.build_benchmark()
-
-
-def fuzz(input_corpus, output_corpus, target_binary):
-    """Run fuzzer."""
-    prepare_fuzz_environment(input_corpus)
-    dictionary_path = utils.get_dictionary_path(target_binary)
-    command = [target_binary]
-    if dictionary_path:
-        command += (['-x', dictionary_path])
-    command += (['-o', output_corpus, '-i', input_corpus])
-    print(command)
-    subprocess.check_call(command, cwd=os.environ['OUT'])
diff --git a/fuzzers/libafl_text/runner.Dockerfile b/fuzzers/libafl_text/runner.Dockerfile
deleted file mode 100644
index 7aa1da8e4..000000000
--- a/fuzzers/libafl_text/runner.Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM gcr.io/fuzzbench/base-image
-
-# This makes interactive docker runs painless:
-ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/out"
-#ENV AFL_MAP_SIZE=2621440
-ENV PATH="$PATH:/out"
-ENV AFL_SKIP_CPUFREQ=1
-ENV AFL_I_DONT_CARE_ABOUT_MISSING_CRASHES=1
-ENV AFL_TESTCACHE_SIZE=2