diff --git a/ci/collect_artifacts.py b/ci/collect_artifacts.py
index 702f7fa3ef02d2a82ac9311fb8f0ec6e27ef4a6b..c67445e51cdbc67e190622e8ee0387abd0ed61a8 100755
--- a/ci/collect_artifacts.py
+++ b/ci/collect_artifacts.py
@@ -14,39 +14,20 @@ def main(args):
         collect_for_sanitizer_test(file)
 
 
-def find_failed_files_for_sanitizer_test(
-    console_log: list, subfolder: str, which="LOGS"
-) -> dict():
+def find_failed_files_for_sanitizer_test(console_log: list) -> dict():
 
-    assert which in ["LOGS", "FILE_BASENAMES"]
-
-    pattern_line = "(Encoding|Decoding) failed .*for \/.*(CLANG.|VALGRIND)\/(.*)"
-    pattern_file = "(.*_b[0-9]*_.*_rs|.*_b[0-9]*_.*_cbr).*"
+    pattern_line = r"(CLANG.) reports . error\(s\) for (.*)"
 
     files_found = dict()
     for line in console_log:
         m_line = re.match(pattern_line, line)
 
         if m_line is not None:
-            _, test, filename = m_line.groups()
-            filename = pathlib.Path(filename).name
-            m_file = re.match(pattern_file, filename)
-            if m_file is None:
-                print(f"Unexpected: no match on {filename} with {pattern_file} - skip")
-                continue
-            filename_start = m_file.groups()[0]
-
-            if which == "LOGS":
-                folder = pathlib.Path(f"{test}/{subfolder}/")
-                files = [
-                    f for f in folder.iterdir() if f.name.startswith(filename_start)
-                ]
-            elif which == "FILE_BASENAMES":
-                files = [filename_start]
+            test, filename = m_line.groups()
             if test in files_found:
-                files_found[test].extend(files)
+                files_found[test].append(filename)
             else:
-                files_found[test] = files
+                files_found[test] = [filename]
 
     return files_found
 
@@ -56,16 +37,20 @@ def collect_for_sanitizer_test(file):
     with open(file) as f:
         console_log = f.readlines()
 
-    files_to_archive_noPLC = find_failed_files_for_sanitizer_test(
-        console_log, "logs_noPLC"
-    )
-    files_to_archive = find_failed_files_for_sanitizer_test(console_log, "logs")
+    start_indicators = ["Adding config" in l for l in console_log]
+    idx_first_run = start_indicators.index(True)
+    idx_second_run = start_indicators[idx_first_run + 1:].index(True) + idx_first_run + 1
+    no_plc_part = console_log[idx_first_run:idx_second_run]
+    plc_part = console_log[idx_second_run:]
+
+    files_to_archive_noPLC = find_failed_files_for_sanitizer_test(no_plc_part)
+    files_to_archive_PLC = find_failed_files_for_sanitizer_test(plc_part)
 
     log_folder = pathlib.Path("./LOGS_PLC")
     log_folder.mkdir()
-    for test in files_to_archive.keys():
+    for test in files_to_archive_PLC.keys():
         log_folder.joinpath(test).mkdir()
-    for test, files in files_to_archive.items():
+    for test, files in files_to_archive_PLC.items():
         folder = log_folder.joinpath(test)
         for p in files:
             source = pathlib.Path(p)
@@ -79,7 +64,7 @@ def collect_for_sanitizer_test(file):
     for test, files in files_to_archive_noPLC.items():
         folder = log_folder_noPLC.joinpath(test)
         for p in files:
-            source = pathlib.Path(p)
+            source = pathlib.Path(p.replace("/logs/", "/logs_noPLC/"))
             target = folder.joinpath(source.name)
             source.rename(target)
 
diff --git a/ci/run_scheduled_sanitizer_test.py b/ci/run_scheduled_sanitizer_test.py
index fa5202ef94c0b6b1951f105fbb8e88f14d699447..6692c94d7c8e2f928e7788bf469070b4328c217e 100755
--- a/ci/run_scheduled_sanitizer_test.py
+++ b/ci/run_scheduled_sanitizer_test.py
@@ -180,9 +180,7 @@ def run_check(in_format: str, out_formats: list, tests: list, run_fec: bool = Tr
     # delete bitstream files for all failed modes to prevent follow-up errors in decoder-only run
     with open(CONSOLE_OUT_FILE) as f:
         console_log = f.readlines()
-    failed_files = find_failed_files_for_sanitizer_test(
-        console_log, "logs", "FILE_BASENAMES"
-    )
+    failed_files = find_failed_files_for_sanitizer_test(console_log)
     for t in failed_files.keys():
         bs_folder = pathlib.Path(f"{t}/enc")
         file_starts = failed_files[t]