diff --git a/tools/ci/amd64/clang/msan.supp b/tools/ci/amd64/clang/msan.supp
index 88f01b7..073004f 100644
--- a/tools/ci/amd64/clang/msan.supp
+++ b/tools/ci/amd64/clang/msan.supp
@@ -1,76 +1,12 @@
-src:/drone/src/build/modules/surface*
-src:/drone/src/build/*
-src:/drone/*
+# /tmp/msan_ignorelist.txt
 
-src:/msan/lib/libX11*
-obj:/msan/lib/libX11*
-src:/msan/lib/libX11*
-
-src:/drone/src/modules/surface/*
-src:/drone/src/modules/surface/private/linux/system.cpp
-src:*/linux/*.cpp
-
-src:/msan/lib/libX11.so.6+0xa2e77
-src:/msan/lib/libX11.so.6
-obj:/msan/lib/libX11.so.6+0xa2e77
+# Primary: ignore X11/XCB objects (match object path substring)
+obj:/msan/lib/libX11.so
 obj:/msan/lib/libX11.so.6
-src:/msan/lib/libX11.so.*
-src:/msan/lib/libX11.so.*
-obj:/msan/lib/libX11.so.*
-obj:/msan/lib/libX11.so.*
+obj:/msan/lib/libxcb.so
+obj:/msan/lib/libxcb.so.1
 
-fun:XFlush
-fun:*X*
-fun:*X*
-
-fun:writev
-fun:write_vec
-fun:_xcb_conn_wait
-fun:_xcb_out_send
-fun:xcb_writev
-fun:_XSend
-fun:_XFlush
-fun:XFlush
-fun:lt::surface::System::create_surface_component
-fun:Fixture::create_component
-
-fun:*writev
-fun:*write_vec
-fun:*_xcb_conn_wait
-fun:*_xcb_out_send
-fun:*xcb_writev
-fun:*_XSend
-fun:*_XFlush
-fun:*XFlush
-fun:*lt::surface::System::create_surface_component
-fun:*Fixture::create_component
-
-fun:*writev*
-fun:*write_vec*
-fun:*_xcb_conn_wait*
-fun:*_xcb_out_send*
-fun:*xcb_writev*
-fun:*_XSend*
-fun:*_XFlush*
-fun:*XFlush*
-fun:*lt::surface::System::create_surface_component*
-fun:*Fixture::create_component*
-
-fun:writev*
-fun:write_vec*
-fun:_xcb_conn_wait*
-fun:_xcb_out_send*
-fun:xcb_writev*
-fun:_XSend*
-fun:_XFlush*
-fun:XFlush*
-fun:lt::surface::System::create_surface_component*
-fun:Fixture::create_component*
-
-fun:_XData32
-src:read_iovec
-
-# Ignore system X11/XCB libraries (not MSan-instrumented)
+# Functions in X11/XCB stack (demangled names as seen in traces)
 fun:_XData32
 fun:XChangeProperty
 fun:_XSend
@@ -81,6 +17,11 @@ fun:_xcb_conn_wait
 fun:_xcb_out_send
 fun:xcb_writev
 
-# Alternatively, blanket-ignore the libraries themselves
-src:/msan/lib/libX11.so.*
-src:/msan/lib/libxcb.so.*
+# Functions in your binary where "use" occurs
+fun:writev
+fun:read_iovec
+
+# Optionally ignore the test harness calls (if you want)
+fun:lt::surface::System::create_surface_component
+fun:Fixture::create_component
+