diff --git a/notify/jira/description b/notify/jira/description
index 20778cca2..a0890516e 100644
--- a/notify/jira/description
+++ b/notify/jira/description
@@ -8,14 +8,12 @@ Date:   Fri Jul 7 10:58:13 2023 +0200
     Such jumps are not allowed by GCC and allowing them
     can lead to situations where we jumps into unevaluated
     statements.
-    
-    Fixes #63682
-... 4 lines of the commit log omitted.
+... 6 lines of the commit log omitted.
 
 * tcwg_kernel
 ** llvm-master-arm-next-allyesconfig
 *** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/20219106060208f0c2f5d096eb3aed7b712f5067/tcwg_kernel/llvm-master-arm-next-allyesconfig/details.txt
+*** https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/llvm/sha1/20219106060208f0c2f5d096eb3aed7b712f5067/tcwg_kernel/llvm-master-arm-next-allyesconfig/details.txt
 *** https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-next-allyesconfig-build/100/artifact/artifacts
 
-Latest data: https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/20219106060208f0c2f5d096eb3aed7b712f5067/jira/yaml
+Latest data: https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/llvm/sha1/20219106060208f0c2f5d096eb3aed7b712f5067/jira/yaml
diff --git a/notify/jira/yaml b/notify/jira/yaml
index 3da673c2a..fe7969415 100644
--- a/notify/jira/yaml
+++ b/notify/jira/yaml
@@ -16,14 +16,12 @@
         Such jumps are not allowed by GCC and allowing them
         can lead to situations where we jumps into unevaluated
         statements.
-        
-        Fixes #63682
-    ... 4 lines of the commit log omitted.
+    ... 6 lines of the commit log omitted.
     
     * tcwg_kernel
     ** llvm-master-arm-next-allyesconfig
     *** Failure
-    *** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/20219106060208f0c2f5d096eb3aed7b712f5067/tcwg_kernel/llvm-master-arm-next-allyesconfig/details.txt
+    *** https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/llvm/sha1/20219106060208f0c2f5d096eb3aed7b712f5067/tcwg_kernel/llvm-master-arm-next-allyesconfig/details.txt
     *** https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-next-allyesconfig-build/100/artifact/artifacts
     
-    Latest data: https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/20219106060208f0c2f5d096eb3aed7b712f5067/jira/yaml
+    Latest data: https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/llvm/sha1/20219106060208f0c2f5d096eb3aed7b712f5067/jira/yaml
diff --git a/notify/mail-body.txt b/notify/mail-body.txt
index 70aeac380..28c96303e 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-905 , 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-next-allyesconfig after:
+Our automatic CI has detected problems related to your patch(es). Please find some details below.
 
+In tcwg_kernel/llvm-master-arm-next-allyesconfig, after:
   | commit llvmorg-17-init-18885-g202191060602
   | Author: Corentin Jabot <corentinjabot@gmail.com>
   | Date:   Fri Jul 7 10:58:13 2023 +0200
@@ -15,63 +12,63 @@ In CI config tcwg_kernel/llvm-master-arm-next-allyesconfig after:
   |     Such jumps are not allowed by GCC and allowing them
   |     can lead to situations where we jumps into unevaluated
   |     statements.
-  |     
-  |     Fixes #63682
-  | ... 4 lines of the commit log omitted.
+  | ... 6 lines of the commit log omitted.
 
-Results changed to
-# reset_artifacts:
--10
-# build_abe binutils:
--9
-# build_kernel_llvm:
--5
-# build_abe qemu:
--2
-# linux_n_obj:
-21296
-# First few build errors in logs:
+Produces Failure:
+  | Results changed to
+  | # reset_artifacts:
+  | -10
+  | # build_abe binutils:
+  | -9
+  | # build_kernel_llvm:
+  | -5
+  | # build_abe qemu:
+  | -2
+  | # linux_n_obj:
+  | 21296
+  | # First few build errors in logs:
+  | 
+  | # 00:11:45 fs/btrfs/extent_io.c:232:16: error: variable 'pages_processed' set but not used [-Werror,-Wunused-but-set-variable]
+  | # 00:11:45 make[4]: *** [scripts/Makefile.build:243: fs/btrfs/extent_io.o] Error 1
+  | # 00:16:05 drivers/gpu/drm/tests/drm_exec_test.c:41:3: error: cannot jump from this indirect goto statement to one of its possible targets
+  | # 00:16:05 drivers/gpu/drm/tests/drm_exec_test.c:60:3: error: cannot jump from this indirect goto statement to one of its possible targets
+  | # 00:16:05 drivers/gpu/drm/tests/drm_exec_test.c:86:3: error: cannot jump from this indirect goto statement to one of its possible targets
+  | # 00:16:05 drivers/gpu/drm/tests/drm_exec_test.c:114:3: error: cannot jump from this indirect goto statement to one of its possible targets
+  | # 00:16:05 make[6]: *** [scripts/Makefile.build:243: drivers/gpu/drm/tests/drm_exec_test.o] Error 1
+  | # 00:16:05 make[5]: *** [scripts/Makefile.build:480: drivers/gpu/drm/tests] Error 2
+  | # 00:16:28 make[3]: *** [scripts/Makefile.build:480: fs/btrfs] Error 2
+  | # 00:17:11 drivers/regulator/max77857-regulator.c:312:16: error: initializer element is not a compile-time constant
+  | # 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:
+  | 21301
 
-# 00:11:45 fs/btrfs/extent_io.c:232:16: error: variable 'pages_processed' set but not used [-Werror,-Wunused-but-set-variable]
-# 00:11:45 make[4]: *** [scripts/Makefile.build:243: fs/btrfs/extent_io.o] Error 1
-# 00:16:05 drivers/gpu/drm/tests/drm_exec_test.c:41:3: error: cannot jump from this indirect goto statement to one of its possible targets
-# 00:16:05 drivers/gpu/drm/tests/drm_exec_test.c:60:3: error: cannot jump from this indirect goto statement to one of its possible targets
-# 00:16:05 drivers/gpu/drm/tests/drm_exec_test.c:86:3: error: cannot jump from this indirect goto statement to one of its possible targets
-# 00:16:05 drivers/gpu/drm/tests/drm_exec_test.c:114:3: error: cannot jump from this indirect goto statement to one of its possible targets
-# 00:16:05 make[6]: *** [scripts/Makefile.build:243: drivers/gpu/drm/tests/drm_exec_test.o] Error 1
-# 00:16:05 make[5]: *** [scripts/Makefile.build:480: drivers/gpu/drm/tests] Error 2
-# 00:16:28 make[3]: *** [scripts/Makefile.build:480: fs/btrfs] Error 2
-# 00:17:11 drivers/regulator/max77857-regulator.c:312:16: error: initializer element is not a compile-time constant
+Used configuration :
+ tcwg_kernel/llvm-master-arm-next-allyesconfig
 
-From
-# reset_artifacts:
--10
-# build_abe binutils:
--9
-# build_kernel_llvm:
--5
-# build_abe qemu:
--2
-# linux_n_obj:
-21301
+We track this bug report under https://linaro.atlassian.net/browse/LLVM-905. Please let us know if you have a fix.
 
-The configuration of this build is:
-CI config tcwg_kernel/llvm-master-arm-next-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-arm-next-allyesconfig-build/100/artifact/artifacts
 Reference build : https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-next-allyesconfig-build/99/artifact/artifacts
 
-Reproduce last good and first bad builds: https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/20219106060208f0c2f5d096eb3aed7b712f5067/tcwg_kernel/llvm-master-arm-next-allyesconfig/reproduction_instructions.txt
+Instruction to reproduce the build : https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/llvm/sha1/20219106060208f0c2f5d096eb3aed7b712f5067/tcwg_kernel/llvm-master-arm-next-allyesconfig/reproduction_instructions.txt
 
 Full commit : https://github.com/llvm/llvm-project/commit/20219106060208f0c2f5d096eb3aed7b712f5067
 
-List of configurations that regressed due to this commit :
-* tcwg_kernel
-** llvm-master-arm-next-allyesconfig
-*** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/llvm/sha1/20219106060208f0c2f5d096eb3aed7b712f5067/tcwg_kernel/llvm-master-arm-next-allyesconfig/details.txt
-*** https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-next-allyesconfig-build/100/artifact/artifacts
-
