diff --git a/notify/jira/description b/notify/jira/description
index 36c845c2..f23cf322 100644
--- a/notify/jira/description
+++ b/notify/jira/description
@@ -12,7 +12,7 @@ Date:   Sun Sep 1 18:08:25 2024 -0400
 * tcwg_kernel
 ** llvm-master-aarch64-next-allyesconfig
 *** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/linux/sha1/4e7795eda4459bf3e69c87c793bc34f610f9d981/tcwg_kernel/llvm-master-aarch64-next-allyesconfig/details.txt
+*** https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/linux/sha1/4e7795eda4459bf3e69c87c793bc34f610f9d981/tcwg_kernel/llvm-master-aarch64-next-allyesconfig/details.txt
 *** https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-next-allyesconfig-build/234/artifact/artifacts
 
-Latest data: https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/linux/sha1/4e7795eda4459bf3e69c87c793bc34f610f9d981/jira/yaml
+Latest data: https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/linux/sha1/4e7795eda4459bf3e69c87c793bc34f610f9d981/jira/yaml
diff --git a/notify/jira/yaml b/notify/jira/yaml
index bd1bea66..9a42bb6f 100644
--- a/notify/jira/yaml
+++ b/notify/jira/yaml
@@ -20,7 +20,7 @@
     * tcwg_kernel
     ** llvm-master-aarch64-next-allyesconfig
     *** Failure
-    *** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/linux/sha1/4e7795eda4459bf3e69c87c793bc34f610f9d981/tcwg_kernel/llvm-master-aarch64-next-allyesconfig/details.txt
+    *** https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/linux/sha1/4e7795eda4459bf3e69c87c793bc34f610f9d981/tcwg_kernel/llvm-master-aarch64-next-allyesconfig/details.txt
     *** https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-next-allyesconfig-build/234/artifact/artifacts
     
-    Latest data: https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/linux/sha1/4e7795eda4459bf3e69c87c793bc34f610f9d981/jira/yaml
+    Latest data: https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/linux/sha1/4e7795eda4459bf3e69c87c793bc34f610f9d981/jira/yaml
diff --git a/notify/mail-body.txt b/notify/mail-body.txt
index f425df31..7cdff01f 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-1339 , 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-next-allyesconfig after:
+Our automatic CI has detected problems related to your patch(es). Please find some details below.
 
+In tcwg_kernel/llvm-master-aarch64-next-allyesconfig, after:
   | commit v6.11-rc1-143-g4e7795eda4459
   | Author: Kent Overstreet <kent.overstreet@linux.dev>
   | Date:   Sun Sep 1 18:08:25 2024 -0400
@@ -16,49 +13,51 @@ In CI config tcwg_kernel/llvm-master-aarch64-next-allyesconfig after:
   |     
   |     Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
 
-Results changed to
-# reset_artifacts:
--10
-# build_abe binutils:
--9
-# build_kernel_llvm:
--5
-# build_abe qemu:
--2
-# linux_n_obj:
-23322
+Produces Failure:
+  | Results changed to
+  | # reset_artifacts:
+  | -10
+  | # build_abe binutils:
+  | -9
+  | # build_kernel_llvm:
+  | -5
+  | # build_abe qemu:
+  | -2
+  | # linux_n_obj:
+  | 23322
+  | # 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:
+  | 23397
+  | # linux build successful:
+  | all
+
+Used configuration :
+ tcwg_kernel/llvm-master-aarch64-next-allyesconfig
+
+We track this bug report under https://linaro.atlassian.net/browse/LLVM-1339. 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.
 
-From
-# reset_artifacts:
--10
-# build_abe binutils:
--9
-# build_kernel_llvm:
--5
-# build_abe qemu:
--2
-# linux_n_obj:
-23397
-# linux build successful:
-all
+-----------------8<--------------------------8<--------------------------8<--------------------------
+
+The information below contains the details of the failures, and the ways to reproduce a debug environment:
 
-The configuration of this build is:
-CI config tcwg_kernel/llvm-master-aarch64-next-allyesconfig
 
------------------8<--------------------------8<--------------------------8<--------------------------
-The information below can be used to reproduce a debug environment:
 
 Current build   : https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-next-allyesconfig-build/234/artifact/artifacts
 Reference build : https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-next-allyesconfig-build/233/artifact/artifacts
 
-Reproduce last good and first bad builds: https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/linux/sha1/4e7795eda4459bf3e69c87c793bc34f610f9d981/tcwg_kernel/llvm-master-aarch64-next-allyesconfig/reproduction_instructions.txt
+Instruction to reproduce the build : https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/linux/sha1/4e7795eda4459bf3e69c87c793bc34f610f9d981/tcwg_kernel/llvm-master-aarch64-next-allyesconfig/reproduction_instructions.txt
 
 Full commit : https://gitlab.com/Linaro/lkft/mirrors/next/linux-next/commit/4e7795eda4459bf3e69c87c793bc34f610f9d981
 
-List of configurations that regressed due to this commit :
-* tcwg_kernel
-** llvm-master-aarch64-next-allyesconfig
-*** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/linux/sha1/4e7795eda4459bf3e69c87c793bc34f610f9d981/tcwg_kernel/llvm-master-aarch64-next-allyesconfig/details.txt
-*** https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-next-allyesconfig-build/234/artifact/artifacts
-
