diff --git a/fuzzers/gramatron/builder.Dockerfile b/fuzzers/gramatron/builder.Dockerfile
index d104b9f7e..3ad5056f8 100644
--- a/fuzzers/gramatron/builder.Dockerfile
+++ b/fuzzers/gramatron/builder.Dockerfile
@@ -32,14 +32,14 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /rustup.sh && \
 # Download libafl
 RUN git clone https://github.com/AFLplusplus/libafl_fuzzbench /libafl_fuzzbench && \
     cd /libafl_fuzzbench && \
-    git checkout 7c1b2aad1c458cca7ce50097e53db07ec7d7fdbe && \
+    git checkout b7fc9fd143daff0190fd623ed3a8b9fbc64cc00c && \
     git submodule update --init
 
 # Compile libafl
 RUN cd /libafl_fuzzbench/ && unset CFLAGS && unset CXXFLAGS && \
     export CC=clang && export CXX=clang++ && \
     export LIBAFL_EDGES_MAP_SIZE=2621440 && \
-    PATH="/root/.cargo/bin:$PATH" cargo build --release
+    PATH="/root/.cargo/bin:$PATH" cargo build --release -p gramatron
 
 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 && \
diff --git a/fuzzers/grimoire/builder.Dockerfile b/fuzzers/grimoire/builder.Dockerfile
index d104b9f7e..eff47a170 100644
--- a/fuzzers/grimoire/builder.Dockerfile
+++ b/fuzzers/grimoire/builder.Dockerfile
@@ -32,14 +32,14 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /rustup.sh && \
 # Download libafl
 RUN git clone https://github.com/AFLplusplus/libafl_fuzzbench /libafl_fuzzbench && \
     cd /libafl_fuzzbench && \
-    git checkout 7c1b2aad1c458cca7ce50097e53db07ec7d7fdbe && \
+    git checkout b7fc9fd143daff0190fd623ed3a8b9fbc64cc00c && \
     git submodule update --init
 
 # Compile libafl
 RUN cd /libafl_fuzzbench/ && unset CFLAGS && unset CXXFLAGS && \
     export CC=clang && export CXX=clang++ && \
     export LIBAFL_EDGES_MAP_SIZE=2621440 && \
-    PATH="/root/.cargo/bin:$PATH" cargo build --release
+    PATH="/root/.cargo/bin:$PATH" cargo build --release -p grimoire
 
 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 && \
diff --git a/fuzzers/nautilus/builder.Dockerfile b/fuzzers/nautilus/builder.Dockerfile
index d104b9f7e..80234194a 100644
--- a/fuzzers/nautilus/builder.Dockerfile
+++ b/fuzzers/nautilus/builder.Dockerfile
@@ -32,14 +32,14 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /rustup.sh && \
 # Download libafl
 RUN git clone https://github.com/AFLplusplus/libafl_fuzzbench /libafl_fuzzbench && \
     cd /libafl_fuzzbench && \
-    git checkout 7c1b2aad1c458cca7ce50097e53db07ec7d7fdbe && \
+    git checkout b7fc9fd143daff0190fd623ed3a8b9fbc64cc00c && \
     git submodule update --init
 
 # Compile libafl
 RUN cd /libafl_fuzzbench/ && unset CFLAGS && unset CXXFLAGS && \
     export CC=clang && export CXX=clang++ && \
     export LIBAFL_EDGES_MAP_SIZE=2621440 && \
-    PATH="/root/.cargo/bin:$PATH" cargo build --release
+    PATH="/root/.cargo/bin:$PATH" cargo build --release -p nautilus
 
 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 && \
diff --git a/fuzzers/nautilus/runner.Dockerfile b/fuzzers/nautilus/runner.Dockerfile
index 7aa1da8e4..e64e00904 100644
--- a/fuzzers/nautilus/runner.Dockerfile
+++ b/fuzzers/nautilus/runner.Dockerfile
@@ -14,6 +14,8 @@
 
 FROM gcr.io/fuzzbench/base-image
 
+RUN apt update && apt -y install libexpat1-dev zlib1g-dev
+
 # This makes interactive docker runs painless:
 ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/out"
 #ENV AFL_MAP_SIZE=2621440
diff --git a/fuzzers/token_level/builder.Dockerfile b/fuzzers/token_level/builder.Dockerfile
index d104b9f7e..00b6fcfd3 100644
--- a/fuzzers/token_level/builder.Dockerfile
+++ b/fuzzers/token_level/builder.Dockerfile
@@ -32,14 +32,14 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /rustup.sh && \
 # Download libafl
 RUN git clone https://github.com/AFLplusplus/libafl_fuzzbench /libafl_fuzzbench && \
     cd /libafl_fuzzbench && \
-    git checkout 7c1b2aad1c458cca7ce50097e53db07ec7d7fdbe && \
+    git checkout b7fc9fd143daff0190fd623ed3a8b9fbc64cc00c && \
     git submodule update --init
 
 # Compile libafl
 RUN cd /libafl_fuzzbench/ && unset CFLAGS && unset CXXFLAGS && \
     export CC=clang && export CXX=clang++ && \
     export LIBAFL_EDGES_MAP_SIZE=2621440 && \
-    PATH="/root/.cargo/bin:$PATH" cargo build --release
+    PATH="/root/.cargo/bin:$PATH" cargo build --release -p token_level
 
 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 && \
diff --git a/fuzzers/token_level/runner.Dockerfile b/fuzzers/token_level/runner.Dockerfile
index 7aa1da8e4..e64e00904 100644
--- a/fuzzers/token_level/runner.Dockerfile
+++ b/fuzzers/token_level/runner.Dockerfile
@@ -14,6 +14,8 @@
 
 FROM gcr.io/fuzzbench/base-image
 
+RUN apt update && apt -y install libexpat1-dev zlib1g-dev
+
 # This makes interactive docker runs painless:
 ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/out"
 #ENV AFL_MAP_SIZE=2621440