diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile
index 4a4d4c3d01f9..6bedecbc6bab 100644
--- a/infra/base-images/base-builder/Dockerfile
+++ b/infra/base-images/base-builder/Dockerfile
@@ -78,6 +78,8 @@ ENV RUSTUP_HOME=/rust/rustup
 ENV PATH=$PATH:/rust/bin
 RUN curl https://sh.rustup.rs | sh -s -- -y --default-toolchain=nightly
 RUN cargo install cargo-fuzz
+# Needed to recompile rust std library for MSAN
+RUN rustup component add rust-src --toolchain nightly
 
 # Default build flags for various sanitizers.
 ENV SANITIZER_FLAGS_address "-fsanitize=address -fsanitize-address-use-after-scope"
diff --git a/projects/suricata/project.yaml b/projects/suricata/project.yaml
index d29402c43caf..76c6e8f3513b 100644
--- a/projects/suricata/project.yaml
+++ b/projects/suricata/project.yaml
@@ -4,3 +4,7 @@ primary_contact: "vjulien@openinfosecfoundation.org"
 auto_ccs:
 - "jish@openinfosecfoundation.org"
 - "p.antoine@catenacyber.fr"
+sanitizers:
+  - address
+  - memory
+  - undefined