diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile
index 16b787e675f4..7bfd5b6fcd15 100644
--- a/infra/base-images/base-builder/Dockerfile
+++ b/infra/base-images/base-builder/Dockerfile
@@ -125,7 +125,7 @@ WORKDIR $SRC
 COPY afl_llvm22_patch.diff $SRC/
 RUN git clone https://github.com/AFLplusplus/AFLplusplus.git aflplusplus && \
     cd aflplusplus && \
-    git checkout eadc8a2a7e0fa0338802ee6254bf296489ce4fd7 && \
+    git checkout 474ff18ba2a7999a518a4d194fcd5a1f87c3625d && \
     wget --no-check-certificate -O oss.sh https://raw.githubusercontent.com/vanhauser-thc/binary_blobs/master/oss.sh && \
     git apply $SRC/afl_llvm22_patch.diff && \
     rm -rf .git && \
diff --git a/infra/base-images/base-builder/ubuntu-20-04.Dockerfile b/infra/base-images/base-builder/ubuntu-20-04.Dockerfile
index 749fb349f489..f798766b3fcc 100644
--- a/infra/base-images/base-builder/ubuntu-20-04.Dockerfile
+++ b/infra/base-images/base-builder/ubuntu-20-04.Dockerfile
@@ -125,7 +125,7 @@ WORKDIR $SRC
 COPY afl_llvm22_patch.diff $SRC/
 RUN git clone https://github.com/AFLplusplus/AFLplusplus.git aflplusplus && \
     cd aflplusplus && \
-    git checkout eadc8a2a7e0fa0338802ee6254bf296489ce4fd7 && \
+    git checkout 474ff18ba2a7999a518a4d194fcd5a1f87c3625d && \
     wget --no-check-certificate -O oss.sh https://raw.githubusercontent.com/vanhauser-thc/binary_blobs/master/oss.sh && \
     git apply $SRC/afl_llvm22_patch.diff && \
     rm -rf .git && \
diff --git a/infra/base-images/base-builder/ubuntu-24-04.Dockerfile b/infra/base-images/base-builder/ubuntu-24-04.Dockerfile
index 92e29a5b9465..3616b2b5d3a1 100644
--- a/infra/base-images/base-builder/ubuntu-24-04.Dockerfile
+++ b/infra/base-images/base-builder/ubuntu-24-04.Dockerfile
@@ -125,7 +125,7 @@ WORKDIR $SRC
 COPY afl_llvm22_patch.diff $SRC/
 RUN git clone https://github.com/AFLplusplus/AFLplusplus.git aflplusplus && \
     cd aflplusplus && \
-    git checkout eadc8a2a7e0fa0338802ee6254bf296489ce4fd7 && \
+    git checkout 474ff18ba2a7999a518a4d194fcd5a1f87c3625d && \
     wget --no-check-certificate -O oss.sh https://raw.githubusercontent.com/vanhauser-thc/binary_blobs/master/oss.sh && \
     git apply $SRC/afl_llvm22_patch.diff && \
     rm -rf .git && \