diff --git a/notify/jira/description b/notify/jira/description
index 4a2fcf64f..a9a2be401 100644
--- a/notify/jira/description
+++ b/notify/jira/description
@@ -12,7 +12,7 @@ Date:   Mon Oct 28 20:40:52 2024 +0000
 * tcwg_kernel
 ** llvm-master-aarch64-stable-allyesconfig
 *** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/71315698c91d0cda054b903da0594ca6f072c350/tcwg_kernel/llvm-master-aarch64-stable-allyesconfig/details.txt
+*** https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/llvm/sha1/71315698c91d0cda054b903da0594ca6f072c350/tcwg_kernel/llvm-master-aarch64-stable-allyesconfig/details.txt
 *** https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-stable-allyesconfig-build/241/artifact/artifacts
 
-Latest data: https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/71315698c91d0cda054b903da0594ca6f072c350/jira/yaml
+Latest data: https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/llvm/sha1/71315698c91d0cda054b903da0594ca6f072c350/jira/yaml
diff --git a/notify/jira/yaml b/notify/jira/yaml
index a76839469..308dc7789 100644
--- a/notify/jira/yaml
+++ b/notify/jira/yaml
@@ -20,7 +20,7 @@
     * tcwg_kernel
     ** llvm-master-aarch64-stable-allyesconfig
     *** Failure
-    *** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/71315698c91d0cda054b903da0594ca6f072c350/tcwg_kernel/llvm-master-aarch64-stable-allyesconfig/details.txt
+    *** https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/llvm/sha1/71315698c91d0cda054b903da0594ca6f072c350/tcwg_kernel/llvm-master-aarch64-stable-allyesconfig/details.txt
     *** https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-stable-allyesconfig-build/241/artifact/artifacts
     
-    Latest data: https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/71315698c91d0cda054b903da0594ca6f072c350/jira/yaml
+    Latest data: https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/llvm/sha1/71315698c91d0cda054b903da0594ca6f072c350/jira/yaml
diff --git a/notify/mail-body.txt b/notify/mail-body.txt
index 70ea76938..38e9b5c2f 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 understand 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-1418 , 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-stable-allyesconfig after:
+Our automatic CI has detected problems related to your patch(es). Please find some details below.
 
+In tcwg_kernel/llvm-master-aarch64-stable-allyesconfig, after:
   | commit llvmorg-20-init-10266-g71315698c91d
   | Author: serge-sans-paille <sguelton@mozilla.com>
   | Date:   Mon Oct 28 20:40:52 2024 +0000
@@ -16,40 +13,49 @@ In CI config tcwg_kernel/llvm-master-aarch64-stable-allyesconfig after:
   |     context: both memcpy and memset require their first and second operand
   |     to be trivially copyable, let's warn if that's not the case.
 
-Results changed to
-# reset_artifacts:
--10
-# build_abe binutils:
--9
-# build_kernel_llvm:
--5
-# build_abe qemu:
--2
-# linux_n_obj:
-23330
-
-From
-# reset_artifacts:
--10
-# build_abe binutils:
--9
-# build_kernel_llvm:
--5
-# build_abe qemu:
--2
-# linux_n_obj:
-23331
-
-The configuration of this build is:
-CI config tcwg_kernel/llvm-master-aarch64-stable-allyesconfig
+Produces Failure:
+  | Results changed to
+  | # reset_artifacts:
+  | -10
+  | # build_abe binutils:
+  | -9
+  | # build_kernel_llvm:
+  | -5
+  | # build_abe qemu:
+  | -2
+  | # linux_n_obj:
+  | 23330
+  | # First few build errors in logs:
+  | 
+  | From
+  | # reset_artifacts:
+  | -10
+  | # build_abe binutils:
+  | -9
+  | # build_kernel_llvm:
+  | -5
+  | # build_abe qemu:
+  | -2
+  | # linux_n_obj:
+  | 23331
+
+Used configuration :
+ tcwg_kernel/llvm-master-aarch64-stable-allyesconfig
+
+We track this bug report under https://linaro.atlassian.net/browse/LLVM-1418. Please let us know if you have a fix.
+
+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-stable-allyesconfig-build/241/artifact/artifacts
 Reference build : https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-stable-allyesconfig-build/240/artifact/artifacts
 
-Instruction to reproduce the build : https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/71315698c91d0cda054b903da0594ca6f072c350/tcwg_kernel/llvm-master-aarch64-stable-allyesconfig/reproduction_instructions.txt
+Instruction to reproduce the build : https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/llvm/sha1/71315698c91d0cda054b903da0594ca6f072c350/tcwg_kernel/llvm-master-aarch64-stable-allyesconfig/reproduction_instructions.txt
 
 Full commit : https://github.com/llvm/llvm-project/commit/71315698c91d0cda054b903da0594ca6f072c350