diff --git a/notify/configure-toolchain.txt b/notify/configure-toolchain.txt
index 5cc07e9ba..ccf8155a3 100644
--- a/notify/configure-toolchain.txt
+++ b/notify/configure-toolchain.txt
@@ -3,18 +3,3 @@ Most relevant configure and test flags: none, autodetected on aarch64-unknown-li
 
 Full configure and make flags for each step:
 
-# 03-build_abe-gcc
-(cd /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2 && /bin/bash /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/snapshots/gcc.git~master/configure SHELL=/bin/bash  --with-mpc=/home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/destdir/aarch64-unknown-linux-gnu --with-mpfr=/home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/destdir/aarch64-unknown-linux-gnu --with-gmp=/home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/destdir/aarch64-unknown-linux-gnu --with-gnu-as --with-gnu-ld --disable-libmudflap --enable-lto --enable-shared --without-included-gettext --enable-nls --with-system-zlib --disable-sjlj-exceptions --enable-gnu-unique-object --enable-linker-build-id --disable-libstdcxx-pch --enable-c99 --enable-clocale=gnu --enable-libstdcxx-debug --enable-long-long --with-cloog=no --with-ppl=no --with-isl=no --disable-multilib --enable-fix-cortex-a53-835769 --enable-fix-cortex-a53-843419 --with-arch=armv8-a --enable-threads=posix --enable-multiarch --enable-libstdcxx-time=yes --enable-gnu-indirect-function --enable-checking=yes --disable-bootstrap --enable-languages=default --prefix=/home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/destdir/aarch64-unknown-linux-gnu )
-make SHELL=/bin/bash -w -C /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2  -j 64 LDFLAGS_FOR_TARGET="-Wl,-fix-cortex-a53-843419"  CFLAGS_FOR_BUILD="-pipe -g -O2" CXXFLAGS_FOR_BUILD="-pipe -g -O2" LDFLAGS_FOR_BUILD="-static-libgcc" MAKEINFOFLAGS=--force 2>&1 | tee -a /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2/make-gcc-stage2.log
-make install  -w -C /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2 2>&1 | tee -a /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2/make-gcc-stage2.log
-
-# 04-build_abe-dejagnu
-(cd /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/dejagnu-dejagnu.git~linaro-local~stable && /bin/bash /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/snapshots/dejagnu.git~linaro-local~stable/configure SHELL=/bin/bash   --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu --prefix=/home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/hosttools/aarch64-unknown-linux-gnu)
-make SHELL=/bin/bash -w -C /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/dejagnu-dejagnu.git~linaro-local~stable  -j 64 LDFLAGS_FOR_TARGET="-Wl,-fix-cortex-a53-843419"  CFLAGS_FOR_BUILD="-pipe -g -O2" CXXFLAGS_FOR_BUILD="-pipe -g -O2" LDFLAGS_FOR_BUILD="-static-libgcc" 2>&1 | tee -a /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/dejagnu-dejagnu.git~linaro-local~stable/make-dejagnu.log
-make install  -w -C /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/dejagnu-dejagnu.git~linaro-local~stable 2>&1 | tee -a /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/dejagnu-dejagnu.git~linaro-local~stable/make-dejagnu.log
-
-# 05-build_abe-check_gcc
-make check FLAGS_UNDER_TEST="" PREFIX_UNDER_TEST="/home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/destdir/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-" QEMU_WRAPPER=/home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/scripts/qemu-wrapper.sh QEMU_CPU_UNDER_TEST=any ABE_TEST_CONTAINER=local  CFLAGS_FOR_BUILD="-pipe" CXXFLAGS_FOR_BUILD="-pipe" -j 64  -w -i -k -C /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2/ >> /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2/check-gcc.log 2>&1
-make check-gcc-c FLAGS_UNDER_TEST="" PREFIX_UNDER_TEST="/home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/destdir/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-" QEMU_WRAPPER=/home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/scripts/qemu-wrapper.sh QEMU_CPU_UNDER_TEST=any ABE_TEST_CONTAINER=local  CFLAGS_FOR_BUILD="-pipe" CXXFLAGS_FOR_BUILD="-pipe" -j 64 RUNTESTFLAGS=" gcc.dg/tree-ssa/tree-ssa.exp" -w -i -k -C /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2/ >> /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2/check-gcc.log 2>&1
-make check-gcc-c++ FLAGS_UNDER_TEST="" PREFIX_UNDER_TEST="/home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/destdir/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-" QEMU_WRAPPER=/home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/scripts/qemu-wrapper.sh QEMU_CPU_UNDER_TEST=any ABE_TEST_CONTAINER=local  CFLAGS_FOR_BUILD="-pipe" CXXFLAGS_FOR_BUILD="-pipe" -j 64 RUNTESTFLAGS=" g++.dg/modules/modules.exp" -w -i -k -C /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2/ >> /home/tcwg-buildslave/workspace/tcwg_gnu_2/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2/check-gcc.log 2>&1
-
diff --git a/notify/fixes.sum b/notify/fixes.sum
index 6c0e8ce72..40c7ddef3 100644
--- a/notify/fixes.sum
+++ b/notify/fixes.sum
@@ -6,5 +6,5 @@ FAIL: gcc.dg/tree-ssa/cswtch-6.c scan-assembler .rodata.cst16
 		=== Results Summary ===
 
 # of stable fails		90
-# of flaky entries		10
+# of flaky entries		1
 # of all tests			956144
diff --git a/notify/lnt_report.json b/notify/lnt_report.json
index 0e173ef5e..c7d62bc81 100644
--- a/notify/lnt_report.json
+++ b/notify/lnt_report.json
@@ -7,7 +7,7 @@
         "Info": {
             "tag": "tcwg_gcc_check",
             "test_url": "https://ci.linaro.org/job/tcwg_gcc_check--master-aarch64-build/4057/",
-            "run_order": "4057 (basepoints/gcc-16-02596-gea588988c19)",
+            "run_order": "4057 (basepoints/gcc-16-02596-gea588988c193)",
             "git_gcc": "git+ssh://linaroci@gcc.gnu.org/git/gcc.git (ea588988c193ee19b61bba5b99e039c9ca267abe) (+ 4 commits)",
             "__report_version__": "1"
         },
@@ -24,7 +24,7 @@
 	   ,
         {
             "Data": [
-                10
+                1
             ],
             "Info": {},
             "Name": "tcwg_gcc_check.TOTAL.flaky.nb_flaky"
diff --git a/notify/mail-body.txt b/notify/mail-body.txt
index 7c0549f89..fe4aede40 100644
--- a/notify/mail-body.txt
+++ b/notify/mail-body.txt
@@ -4,10 +4,10 @@ Our automatic CI successfully passed with your patch(es). Please find some detai
 
 In gcc_check master-aarch64, after:
   | 4 commits in gcc
-  | ea588988c19 output: Move an special # (256) to a new macro
-  | f1c80147641 Improve mergability of CSWTCH [PR120523]
-  | a1ad36f5a89 Un-factor vectorizable_load parts
-  | 6ac78317aa6 Eliminate gather-scatter-info offset_dt member
+  | ea588988c193 output: Move an special # (256) to a new macro
+  | f1c801476417 Improve mergability of CSWTCH [PR120523]
+  | a1ad36f5a899 Un-factor vectorizable_load parts
+  | 6ac78317aa6a Eliminate gather-scatter-info offset_dt member
 
 Produces  1 fix:
   | 
@@ -25,8 +25,8 @@ If you have any questions regarding this report, please ask on linaro-toolchain@
 
 The information below contains the details of the failures, and the ways to reproduce a debug environment:
 
-You can find the failure logs in *.log.1.xz files in
- * https://ci.linaro.org/job/tcwg_gcc_check--master-aarch64-build/4057/artifact/artifacts/00-sumfiles/
+You can find the failure logs in
+ * https://ci.linaro.org/job/tcwg_gcc_check--master-aarch64-build/4057/artifact/artifacts/
 The full lists of regressions and improvements as well as configure and make commands are in
  * https://ci.linaro.org/job/tcwg_gcc_check--master-aarch64-build/4057/artifact/artifacts/notify/
 The list of [ignored] baseline and flaky failures are in
diff --git a/notify/regressions.sum b/notify/regressions.sum
index 42c95db29..6dcc7e248 100644
--- a/notify/regressions.sum
+++ b/notify/regressions.sum
@@ -2,5 +2,5 @@
 		=== Results Summary ===
 
 # of stable fails		89
-# of flaky entries		10
+# of flaky entries		1
 # of all tests			956144
diff --git a/notify/results-summary.txt b/notify/results-summary.txt
index 675348206..5d4469600 100644
--- a/notify/results-summary.txt
+++ b/notify/results-summary.txt
@@ -1,5 +1,5 @@
 		=== Results Summary ===
 
 # of stable fails		89
-# of flaky entries		10
+# of flaky entries		1
 # of all tests			956144
diff --git a/notify/results.compare.txt b/notify/results.compare.txt
index 2e9fee539..b1f9d5bfc 100644
--- a/notify/results.compare.txt
+++ b/notify/results.compare.txt
@@ -1,6 +1,6 @@
 # Comparing directories
 # REFERENCE: base-artifacts/sumfiles
-# CURRENT:   artifacts/sumfiles
+# CURRENT:   artifacts/99-rewrite/artifacts.old/sumfiles
 
 # Comparing 8 common sum files:
 g++.sum
@@ -12,8 +12,8 @@ libitm.sum
 libstdc++.sum
 objc.sum
 Comparing:
-REFERENCE:/tmp/gxx-sum1.2613006
-CURRENT:  /tmp/gxx-sum2.2613006
+REFERENCE:/tmp/gxx-sum1.1603850
+CURRENT:  /tmp/gxx-sum2.1603850
 
                                              +---------+---------+
 o  RUN STATUS:                               |   REF   |   RES   |
