diff --git a/notify/jira/description b/notify/jira/description
index be6a9ae4e..6e1d8107a 100644
--- a/notify/jira/description
+++ b/notify/jira/description
@@ -8,18 +8,16 @@ Date:   Mon May 22 11:38:19 2023 -0700
     As reported by @kees, GCC treats __builtin_object_size of structures
     containing flexible array members (aka arrays with incomplete type) not
     just as the sizeof the underlying type, but additionally the size of the
-    members in a designated initializer list.
-    
-... 5 lines of the commit log omitted.
+... 7 lines of the commit log omitted.
 
 * tcwg_kernel
 ** llvm-master-aarch64-mainline-allyesconfig
 *** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/57c5c1ab2a188b7962c9de5ac0f95e3c7441940a/tcwg_kernel/llvm-master-aarch64-mainline-allyesconfig/details.txt
+*** https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/llvm/sha1/57c5c1ab2a188b7962c9de5ac0f95e3c7441940a/tcwg_kernel/llvm-master-aarch64-mainline-allyesconfig/details.txt
 *** https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-mainline-allyesconfig-build/35/artifact/artifacts
 ** llvm-master-aarch64-next-defconfig
 *** Failure
 *** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/57c5c1ab2a188b7962c9de5ac0f95e3c7441940a/tcwg_kernel/llvm-master-aarch64-next-defconfig/details.txt
 *** https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-next-defconfig-build/28/artifact/artifacts
 
-Latest data: https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/57c5c1ab2a188b7962c9de5ac0f95e3c7441940a/jira/yaml
+Latest data: https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/llvm/sha1/57c5c1ab2a188b7962c9de5ac0f95e3c7441940a/jira/yaml
diff --git a/notify/mail-body.txt b/notify/mail-body.txt
index f0aedcfb3..82f45dc00 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-aarch64-mainline-allyesconfig after:
+Our automatic CI has detected problems related to your patch(es). Please find some details below.
 
+In tcwg_kernel/llvm-master-aarch64-mainline-allyesconfig, after:
   | commit llvmorg-17-init-12062-g57c5c1ab2a18
   | Author: Nick Desaulniers <ndesaulniers@google.com>
   | Date:   Mon May 22 11:38:19 2023 -0700
@@ -15,67 +12,63 @@ In CI config tcwg_kernel/llvm-master-aarch64-mainline-allyesconfig after:
   |     As reported by @kees, GCC treats __builtin_object_size of structures
   |     containing flexible array members (aka arrays with incomplete type) not
   |     just as the sizeof the underlying type, but additionally the size of the
-  |     members in a designated initializer list.
-  |     
-  | ... 5 lines of the commit log omitted.
+  | ... 7 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:
-21722
-# 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:
+  | 21722
+  | # First few build errors in logs:
+  | 
+  | # 00:01:31 clang: error: clang frontend command failed with exit code 134 (use -v to see invocation)
+  | # 00:01:31 make[2]: *** [scripts/Makefile.build:252: io_uring/io_uring.o] Error 1
+  | # 00:01:41 clang: error: clang frontend command failed with exit code 134 (use -v to see invocation)
+  | # 00:01:41 make[4]: *** [scripts/Makefile.build:252: security/keys/trusted-keys/trusted_tee.o] Error 1
+  | # 00:01:44 make[3]: *** [scripts/Makefile.build:494: security/keys/trusted-keys] Error 2
+  | # 00:02:09 clang: error: clang frontend command failed with exit code 134 (use -v to see invocation)
+  | # 00:02:09 make[3]: *** [scripts/Makefile.build:252: fs/crypto/keyring.o] Error 1
+  | # 00:02:18 clang: error: clang frontend command failed with exit code 134 (use -v to see invocation)
+  | # 00:02:18 make[3]: *** [scripts/Makefile.build:252: sound/core/vmaster.o] Error 1
+  | # 00:02:23 make[2]: *** [scripts/Makefile.build:494: fs/crypto] 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:
+  | 21952
+  | # linux build successful:
+  | all
 
-# 00:01:31 clang: error: clang frontend command failed with exit code 134 (use -v to see invocation)
-# 00:01:31 make[2]: *** [scripts/Makefile.build:252: io_uring/io_uring.o] Error 1
-# 00:01:41 clang: error: clang frontend command failed with exit code 134 (use -v to see invocation)
-# 00:01:41 make[4]: *** [scripts/Makefile.build:252: security/keys/trusted-keys/trusted_tee.o] Error 1
-# 00:01:44 make[3]: *** [scripts/Makefile.build:494: security/keys/trusted-keys] Error 2
-# 00:02:09 clang: error: clang frontend command failed with exit code 134 (use -v to see invocation)
-# 00:02:09 make[3]: *** [scripts/Makefile.build:252: fs/crypto/keyring.o] Error 1
-# 00:02:18 clang: error: clang frontend command failed with exit code 134 (use -v to see invocation)
-# 00:02:18 make[3]: *** [scripts/Makefile.build:252: sound/core/vmaster.o] Error 1
-# 00:02:23 make[2]: *** [scripts/Makefile.build:494: fs/crypto] Error 2
+Used configuration :
+ tcwg_kernel/llvm-master-aarch64-mainline-allyesconfig
 
-From
--10
-# build_abe binutils:
--9
-# build_kernel_llvm:
--5
-# build_abe qemu:
--2
-# linux_n_obj:
-21952
-# linux build successful:
-all
+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-aarch64-mainline-allyesconfig
+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-aarch64-mainline-allyesconfig-build/35/artifact/artifacts
 Reference build : https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-mainline-allyesconfig-build/34/artifact/artifacts
 
-Reproduce last good and first bad builds: https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/57c5c1ab2a188b7962c9de5ac0f95e3c7441940a/tcwg_kernel/llvm-master-aarch64-mainline-allyesconfig/reproduction_instructions.txt
+Instruction to reproduce the build : https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/llvm/sha1/57c5c1ab2a188b7962c9de5ac0f95e3c7441940a/tcwg_kernel/llvm-master-aarch64-mainline-allyesconfig/reproduction_instructions.txt
 
 Full commit : https://github.com/llvm/llvm-project/commit/57c5c1ab2a188b7962c9de5ac0f95e3c7441940a
 
-List of configurations that regressed due to this commit :
-* tcwg_kernel
-** llvm-master-aarch64-mainline-allyesconfig
-*** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/57c5c1ab2a188b7962c9de5ac0f95e3c7441940a/tcwg_kernel/llvm-master-aarch64-mainline-allyesconfig/details.txt
-*** https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-mainline-allyesconfig-build/35/artifact/artifacts
-** llvm-master-aarch64-next-defconfig
-*** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/57c5c1ab2a188b7962c9de5ac0f95e3c7441940a/tcwg_kernel/llvm-master-aarch64-next-defconfig/details.txt
-*** https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-next-defconfig-build/28/artifact/artifacts
-
