diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ffcda74486..9db237073e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1312,7 +1312,7 @@ gcc:tsan:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -Wno-stringop-overread -ggdb -O2 -fsanitize=thread"
-    LDFLAGS: "-fsanitize=thread"
+    LDFLAGS: "-fsanitize=thread -Wl,--disable-new-dtags"
     EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock --without-jemalloc PKG_CONFIG_PATH=/opt/tsan/lib/pkgconfig"
   <<: *tsan_fedora_41_amd64_image
   <<: *build_job
@@ -1341,7 +1341,8 @@ clang:tsan:
   variables:
     CC: "${CLANG}"
     CFLAGS: "${CFLAGS_COMMON} -ggdb -O2 -fsanitize=thread"
-    LDFLAGS: "-fsanitize=thread"
+    # -Wl,--disable-new-dtags ensures that Clang creates valid TSAN reports
+    LDFLAGS: "-fsanitize=thread -Wl,--disable-new-dtags"
     EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock --without-jemalloc PKG_CONFIG_PATH=/opt/tsan/lib/pkgconfig"
 
 system:clang:tsan:
diff --git a/util/generate-tsan-stress-jobs.py b/util/generate-tsan-stress-jobs.py
index a8b6566bd8..8ee649ed6f 100755
--- a/util/generate-tsan-stress-jobs.py
+++ b/util/generate-tsan-stress-jobs.py
@@ -29,7 +29,6 @@ for tsan_job in "gcc:tsan", "clang:tsan":
         tsan_stress_test_job["needs"] = [
             {"pipeline": "$PARENT_PIPELINE_ID", "job": tsan_job}
         ]
-        del tsan_stress_test_job["only"]
 
         print(
             yaml.dump(