diff --git a/notify/jira/description b/notify/jira/description
index 032a5640..e12eec22 100644
--- a/notify/jira/description
+++ b/notify/jira/description
@@ -8,9 +8,7 @@ Date:   Mon Jan 23 17:40:59 2023 +0000
     Currently we warn when MI->isBuiltinMacro, but this is only true for
     builtin macros that require processing when expanding. Checking
     SourceMgr.isWrittenInBuiltinFile in addition to this will mean that
-    we catch all builtin macros, though we shouldn't warn on feature test
-    macros.
-... 9 lines of the commit log omitted.
+... 11 lines of the commit log omitted.
 
 * tcwg_kernel
 ** llvm-master-aarch64-lts-allmodconfig
@@ -19,11 +17,11 @@ Date:   Mon Jan 23 17:40:59 2023 +0000
 *** https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-lts-allmodconfig-build/29/artifact/artifacts
 ** llvm-master-aarch64-lts-allyesconfig
 *** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/tcwg_kernel/llvm-master-aarch64-lts-allyesconfig/details.txt
+*** https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/tcwg_kernel/llvm-master-aarch64-lts-allyesconfig/details.txt
 *** https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-lts-allyesconfig-build/30/artifact/artifacts
 ** llvm-master-aarch64-stable-allmodconfig
 *** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/tcwg_kernel/llvm-master-aarch64-stable-allmodconfig/details.txt
+*** https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/tcwg_kernel/llvm-master-aarch64-stable-allmodconfig/details.txt
 *** https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-stable-allmodconfig-build/31/artifact/artifacts
 ** llvm-master-aarch64-stable-allyesconfig
 *** Failure
@@ -39,7 +37,7 @@ Date:   Mon Jan 23 17:40:59 2023 +0000
 *** https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-lts-allyesconfig-build/30/artifact/artifacts
 ** llvm-master-arm-mainline-allmodconfig
 *** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/tcwg_kernel/llvm-master-arm-mainline-allmodconfig/details.txt
+*** https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/tcwg_kernel/llvm-master-arm-mainline-allmodconfig/details.txt
 *** https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-mainline-allmodconfig-build/43/artifact/artifacts
 ** llvm-master-arm-mainline-allyesconfig
 *** Failure
@@ -47,14 +45,14 @@ Date:   Mon Jan 23 17:40:59 2023 +0000
 *** https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-mainline-allyesconfig-build/49/artifact/artifacts
 ** llvm-master-arm-next-allmodconfig
 *** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/tcwg_kernel/llvm-master-arm-next-allmodconfig/details.txt
+*** https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/tcwg_kernel/llvm-master-arm-next-allmodconfig/details.txt
 *** https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-next-allmodconfig-build/71/artifact/artifacts
 ** llvm-master-arm-stable-allmodconfig
 *** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/tcwg_kernel/llvm-master-arm-stable-allmodconfig/details.txt
+*** https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/tcwg_kernel/llvm-master-arm-stable-allmodconfig/details.txt
 *** https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-stable-allmodconfig-build/50/artifact/artifacts
 ** llvm-master-arm-stable-allyesconfig
 *** [TCWG-CI] Failure after llvm commit: [Lex] Warn when defining or undefining any builtin macro
 *** Result summary : Failure
 
-Latest data: https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/jira/yaml
+Latest data: https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/jira/yaml
diff --git a/notify/mail-body.txt b/notify/mail-body.txt
index 67c9db44..ced209b5 100644
--- a/notify/mail-body.txt
+++ b/notify/mail-body.txt
@@ -1,11 +1,8 @@
-Dear contributor, our automatic CI has detected problems related to your patch(es).  Please find some details below.  If you have any questions, please follow up on linaro-toolchain@lists.linaro.org mailing list, Libera's #linaro-tcwg channel, or ping your favourite Linaro toolchain developer on the usual project channel.
+Dear contributor,
 
-We appreciate that it might be difficult to find the necessary logs or reproduce the issue locally. If you can't get what you need from our CI within minutes, let us know and we will be happy to help.
-
-We track this report status in https://linaro.atlassian.net/browse/LLVM-646 , please let us know if you are looking at the problem and/or when you have a fix.
-
-In CI config tcwg_kernel/llvm-master-arm-stable-allmodconfig after:
+Our automatic CI has detected problems related to your patch(es). Please find some details below.
 
+In tcwg_kernel/llvm-master-arm-stable-allmodconfig, after:
   | commit llvmorg-17-init-12472-g0123deb3a6f0
   | Author: John Brawn <john.brawn@arm.com>
   | Date:   Mon Jan 23 17:40:59 2023 +0000
@@ -15,95 +12,56 @@ In CI config tcwg_kernel/llvm-master-arm-stable-allmodconfig after:
   |     Currently we warn when MI->isBuiltinMacro, but this is only true for
   |     builtin macros that require processing when expanding. Checking
   |     SourceMgr.isWrittenInBuiltinFile in addition to this will mean that
-  |     we catch all builtin macros, though we shouldn't warn on feature test
-  |     macros.
-  | ... 9 lines of the commit log omitted.
+  | ... 11 lines of the commit log omitted.
 
-Results changed to
--10
-# build_abe binutils:
--9
-# build_kernel_llvm:
--5
-# build_abe qemu:
--2
-# linux_n_obj:
-36
-# First few build errors in logs:
+Produces Failure:
+  | Results changed to
+  | -10
+  | # build_abe binutils:
+  | -9
+  | # build_kernel_llvm:
+  | -5
+  | # build_abe qemu:
+  | -2
+  | # linux_n_obj:
+  | 36
+  | # First few build errors in logs:
+  | 
+  | # 00:01:58 ./arch/arm/include/uapi/asm/types.h:27:8: error: undefining builtin macro [-Werror,-Wbuiltin-macro-redefined]
+  | # 00:01:58 ./arch/arm/include/uapi/asm/types.h:32:8: error: undefining builtin macro [-Werror,-Wbuiltin-macro-redefined]
+  | # 00:01:58 ./arch/arm/include/uapi/asm/types.h:37:8: error: undefining builtin macro [-Werror,-Wbuiltin-macro-redefined]
+  | # 00:01:58 make[1]: *** [scripts/Makefile.build:114: scripts/mod/devicetable-offsets.s] Error 1
+  | # 00:02:00 make: *** [Makefile:1285: prepare0] Error 2
+  | # First few build errors in logs:
+  | 
+  | From
+  | -10
+  | # build_abe binutils:
+  | -9
+  | # build_kernel_llvm:
+  | -5
+  | # build_abe qemu:
+  | -2
+  | # linux_n_obj:
+  | 23218
 
-# 00:01:58 ./arch/arm/include/uapi/asm/types.h:27:8: error: undefining builtin macro [-Werror,-Wbuiltin-macro-redefined]
-# 00:01:58 ./arch/arm/include/uapi/asm/types.h:32:8: error: undefining builtin macro [-Werror,-Wbuiltin-macro-redefined]
-# 00:01:58 ./arch/arm/include/uapi/asm/types.h:37:8: error: undefining builtin macro [-Werror,-Wbuiltin-macro-redefined]
-# 00:01:58 make[1]: *** [scripts/Makefile.build:114: scripts/mod/devicetable-offsets.s] Error 1
-# 00:02:00 make: *** [Makefile:1285: prepare0] Error 2
+Used configuration :
+ tcwg_kernel/llvm-master-arm-stable-allmodconfig
 
-From
--10
-# build_abe binutils:
--9
-# build_kernel_llvm:
--5
-# build_abe qemu:
--2
-# linux_n_obj:
-23218
+We track this bug report under https://linaro.atlassian.net/browse/LLVM-646. Please let us know if you have a fix.
 
-The configuration of this build is:
-CI config tcwg_kernel/llvm-master-arm-stable-allmodconfig
+If you have any questions regarding this report, please ask on linaro-toolchain@lists.linaro.org mailing list.
 
 -----------------8<--------------------------8<--------------------------8<--------------------------
-The information below can be used to reproduce a debug environment:
+
+The information below contains the details of the failures, and the ways to reproduce a debug environment:
+
+
 
 Current build   : https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-stable-allmodconfig-build/50/artifact/artifacts
 Reference build : https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-stable-allmodconfig-build/49/artifact/artifacts
 
-Reproduce last good and first bad builds: https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/tcwg_kernel/llvm-master-arm-stable-allmodconfig/reproduction_instructions.txt
+Instruction to reproduce the build : https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/tcwg_kernel/llvm-master-arm-stable-allmodconfig/reproduction_instructions.txt
 
 Full commit : https://github.com/llvm/llvm-project/commit/0123deb3a6f0a83095287f51b07c77b7b43ab847
 
-List of configurations that regressed due to this commit :
-* tcwg_kernel
-** llvm-master-aarch64-lts-allmodconfig
-*** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/tcwg_kernel/llvm-master-aarch64-lts-allmodconfig/details.txt
-*** https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-lts-allmodconfig-build/29/artifact/artifacts
-** llvm-master-aarch64-lts-allyesconfig
-*** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/tcwg_kernel/llvm-master-aarch64-lts-allyesconfig/details.txt
-*** https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-lts-allyesconfig-build/30/artifact/artifacts
-** llvm-master-aarch64-stable-allmodconfig
-*** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/tcwg_kernel/llvm-master-aarch64-stable-allmodconfig/details.txt
-*** https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-stable-allmodconfig-build/31/artifact/artifacts
-** llvm-master-aarch64-stable-allyesconfig
-*** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/tcwg_kernel/llvm-master-aarch64-stable-allyesconfig/details.txt
-*** https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-stable-allyesconfig-build/33/artifact/artifacts
-** llvm-master-arm-lts-allmodconfig
-*** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/tcwg_kernel/llvm-master-arm-lts-allmodconfig/details.txt
-*** https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-lts-allmodconfig-build/39/artifact/artifacts
-** llvm-master-arm-lts-allyesconfig
-*** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/tcwg_kernel/llvm-master-arm-lts-allyesconfig/details.txt
-*** https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-lts-allyesconfig-build/30/artifact/artifacts
-** llvm-master-arm-mainline-allmodconfig
-*** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/tcwg_kernel/llvm-master-arm-mainline-allmodconfig/details.txt
-*** https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-mainline-allmodconfig-build/43/artifact/artifacts
-** llvm-master-arm-mainline-allyesconfig
-*** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/tcwg_kernel/llvm-master-arm-mainline-allyesconfig/details.txt
-*** https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-mainline-allyesconfig-build/49/artifact/artifacts
-** llvm-master-arm-next-allmodconfig
-*** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/tcwg_kernel/llvm-master-arm-next-allmodconfig/details.txt
-*** https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-next-allmodconfig-build/71/artifact/artifacts
-** llvm-master-arm-stable-allmodconfig
-*** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/0123deb3a6f0a83095287f51b07c77b7b43ab847/tcwg_kernel/llvm-master-arm-stable-allmodconfig/details.txt
-*** https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-stable-allmodconfig-build/50/artifact/artifacts
-** llvm-master-arm-stable-allyesconfig
-*** [TCWG-CI] Failure after llvm commit: [Lex] Warn when defining or undefining any builtin macro
-*** Result summary : Failure
-
