diff --git a/notify/jira/description b/notify/jira/description
index 0054ce96f..512102771 100644
--- a/notify/jira/description
+++ b/notify/jira/description
@@ -8,22 +8,20 @@ Date:   Thu Mar 16 22:18:50 2017 -0800
     Initially forked from drivers/md/bcache, bcachefs is a new copy-on-write
     filesystem with every feature you could possibly want.
     
-    Website: https://bcachefs.org
-    
-... 1 lines of the commit log omitted.
+... 3 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/linux/sha1/1c6fdbd8f2465ddfb73a01ec620cbf3d14044e1a/tcwg_kernel/llvm-master-aarch64-mainline-allyesconfig/details.txt
+*** https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/linux/sha1/1c6fdbd8f2465ddfb73a01ec620cbf3d14044e1a/tcwg_kernel/llvm-master-aarch64-mainline-allyesconfig/details.txt
 *** https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-mainline-allyesconfig-build/102/artifact/artifacts
 ** llvm-master-arm-mainline-allmodconfig
 *** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/linux/sha1/1c6fdbd8f2465ddfb73a01ec620cbf3d14044e1a/tcwg_kernel/llvm-master-arm-mainline-allmodconfig/details.txt
+*** https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/linux/sha1/1c6fdbd8f2465ddfb73a01ec620cbf3d14044e1a/tcwg_kernel/llvm-master-arm-mainline-allmodconfig/details.txt
 *** https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-mainline-allmodconfig-build/110/artifact/artifacts
 ** llvm-master-arm-mainline-allyesconfig
 *** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/linux/sha1/1c6fdbd8f2465ddfb73a01ec620cbf3d14044e1a/tcwg_kernel/llvm-master-arm-mainline-allyesconfig/details.txt
+*** https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/linux/sha1/1c6fdbd8f2465ddfb73a01ec620cbf3d14044e1a/tcwg_kernel/llvm-master-arm-mainline-allyesconfig/details.txt
 *** https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-mainline-allyesconfig-build/111/artifact/artifacts
 
-Latest data: https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/linux/sha1/1c6fdbd8f2465ddfb73a01ec620cbf3d14044e1a/jira/yaml
+Latest data: https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/linux/sha1/1c6fdbd8f2465ddfb73a01ec620cbf3d14044e1a/jira/yaml
diff --git a/notify/jira/yaml b/notify/jira/yaml
index dfc268171..5922e4cee 100644
--- a/notify/jira/yaml
+++ b/notify/jira/yaml
@@ -16,22 +16,20 @@
         Initially forked from drivers/md/bcache, bcachefs is a new copy-on-write
         filesystem with every feature you could possibly want.
         
-        Website: https://bcachefs.org
-        
-    ... 1 lines of the commit log omitted.
+    ... 3 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/linux/sha1/1c6fdbd8f2465ddfb73a01ec620cbf3d14044e1a/tcwg_kernel/llvm-master-aarch64-mainline-allyesconfig/details.txt
+    *** https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/linux/sha1/1c6fdbd8f2465ddfb73a01ec620cbf3d14044e1a/tcwg_kernel/llvm-master-aarch64-mainline-allyesconfig/details.txt
     *** https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-mainline-allyesconfig-build/102/artifact/artifacts
     ** llvm-master-arm-mainline-allmodconfig
     *** Failure
-    *** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/linux/sha1/1c6fdbd8f2465ddfb73a01ec620cbf3d14044e1a/tcwg_kernel/llvm-master-arm-mainline-allmodconfig/details.txt
+    *** https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/linux/sha1/1c6fdbd8f2465ddfb73a01ec620cbf3d14044e1a/tcwg_kernel/llvm-master-arm-mainline-allmodconfig/details.txt
     *** https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-mainline-allmodconfig-build/110/artifact/artifacts
     ** llvm-master-arm-mainline-allyesconfig
     *** Failure
-    *** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/linux/sha1/1c6fdbd8f2465ddfb73a01ec620cbf3d14044e1a/tcwg_kernel/llvm-master-arm-mainline-allyesconfig/details.txt
+    *** https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/linux/sha1/1c6fdbd8f2465ddfb73a01ec620cbf3d14044e1a/tcwg_kernel/llvm-master-arm-mainline-allyesconfig/details.txt
     *** https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-mainline-allyesconfig-build/111/artifact/artifacts
     
-    Latest data: https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/linux/sha1/1c6fdbd8f2465ddfb73a01ec620cbf3d14044e1a/jira/yaml
+    Latest data: https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/linux/sha1/1c6fdbd8f2465ddfb73a01ec620cbf3d14044e1a/jira/yaml
diff --git a/notify/mail-body.txt b/notify/mail-body.txt
index 44695684f..30b048781 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-1015 , 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-mainline-allyesconfig after:
+Our automatic CI has detected problems related to your patch(es). Please find some details below.
 
+In tcwg_kernel/llvm-master-arm-mainline-allyesconfig, after:
   | commit v6.6-rc1-17-g1c6fdbd8f246
   | Author: Kent Overstreet <kent.overstreet@gmail.com>
   | Date:   Thu Mar 16 22:18:50 2017 -0800
@@ -15,73 +12,65 @@ In CI config tcwg_kernel/llvm-master-arm-mainline-allyesconfig after:
   |     Initially forked from drivers/md/bcache, bcachefs is a new copy-on-write
   |     filesystem with every feature you could possibly want.
   |     
-  |     Website: https://bcachefs.org
-  |     
-  | ... 1 lines of the commit log omitted.
+  | ... 3 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:
-21464
-# 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:
+  | 21464
+  | # First few build errors in logs:
+  | 
+  | # 00:06:54 fs/bcachefs/btree_cache.h:45:43: error: array index 0 is past the end of the array (that has type 'const __u64[0]' (aka 'const unsigned long long[0]')) [-Werror,-Warray-bounds]
+  | # 00:06:54 fs/bcachefs/alloc.c:332:9: error: call to undeclared function 'COUNT_ARGS'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
+  | # 00:06:55 make[4]: *** [scripts/Makefile.build:243: fs/bcachefs/alloc.o] Error 1
+  | # 00:07:00 fs/bcachefs/btree_cache.h:45:43: error: array index 0 is past the end of the array (that has type 'const __u64[0]' (aka 'const unsigned long long[0]')) [-Werror,-Warray-bounds]
+  | # 00:07:00 fs/bcachefs/btree_cache.h:45:43: error: array index 0 is past the end of the array (that has type 'const __u64[0]' (aka 'const unsigned long long[0]')) [-Werror,-Warray-bounds]
+  | # 00:07:01 make[4]: *** [scripts/Makefile.build:243: fs/bcachefs/bset.o] Error 1
+  | # 00:07:01 fs/bcachefs/btree_cache.c:67:9: error: array index 0 is past the end of the array (that has type 'const __u64[0]' (aka 'const unsigned long long[0]')) [-Werror,-Warray-bounds]
+  | # 00:07:01 fs/bcachefs/btree_cache.c:120:2: error: array index 0 is past the end of the array (that has type '__u64[0]' (aka 'unsigned long long[0]')) [-Werror,-Warray-bounds]
+  | # 00:07:01 fs/bcachefs/btree_cache.c:201:6: error: array index 0 is past the end of the array (that has type 'const __u64[0]' (aka 'const unsigned long long[0]')) [-Werror,-Warray-bounds]
+  | # 00:07:01 fs/bcachefs/btree_cache.c:607:3: error: array index 0 is past the end of the array (that has type '__u64[0]' (aka 'unsigned long long[0]')) [-Werror,-Warray-bounds]
+  | # 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:
+  | 21521
+  | # linux build successful:
+  | all
 
-# 00:06:54 fs/bcachefs/btree_cache.h:45:43: error: array index 0 is past the end of the array (that has type 'const __u64[0]' (aka 'const unsigned long long[0]')) [-Werror,-Warray-bounds]
-# 00:06:54 fs/bcachefs/alloc.c:332:9: error: call to undeclared function 'COUNT_ARGS'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
-# 00:06:55 make[4]: *** [scripts/Makefile.build:243: fs/bcachefs/alloc.o] Error 1
-# 00:07:00 fs/bcachefs/btree_cache.h:45:43: error: array index 0 is past the end of the array (that has type 'const __u64[0]' (aka 'const unsigned long long[0]')) [-Werror,-Warray-bounds]
-# 00:07:00 fs/bcachefs/btree_cache.h:45:43: error: array index 0 is past the end of the array (that has type 'const __u64[0]' (aka 'const unsigned long long[0]')) [-Werror,-Warray-bounds]
-# 00:07:01 make[4]: *** [scripts/Makefile.build:243: fs/bcachefs/bset.o] Error 1
-# 00:07:01 fs/bcachefs/btree_cache.c:67:9: error: array index 0 is past the end of the array (that has type 'const __u64[0]' (aka 'const unsigned long long[0]')) [-Werror,-Warray-bounds]
-# 00:07:01 fs/bcachefs/btree_cache.c:120:2: error: array index 0 is past the end of the array (that has type '__u64[0]' (aka 'unsigned long long[0]')) [-Werror,-Warray-bounds]
-# 00:07:01 fs/bcachefs/btree_cache.c:201:6: error: array index 0 is past the end of the array (that has type 'const __u64[0]' (aka 'const unsigned long long[0]')) [-Werror,-Warray-bounds]
-# 00:07:01 fs/bcachefs/btree_cache.c:607:3: error: array index 0 is past the end of the array (that has type '__u64[0]' (aka 'unsigned long long[0]')) [-Werror,-Warray-bounds]
+Used configuration :
+ tcwg_kernel/llvm-master-arm-mainline-allyesconfig
 
-From
-# reset_artifacts:
--10
-# build_abe binutils:
--9
-# build_kernel_llvm:
--5
-# build_abe qemu:
--2
-# linux_n_obj:
-21521
-# linux build successful:
-all
+We track this bug report under https://linaro.atlassian.net/browse/LLVM-1015. Please let us know if you have a fix.
 
-The configuration of this build is:
-CI config tcwg_kernel/llvm-master-arm-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-arm-mainline-allyesconfig-build/111/artifact/artifacts
 Reference build : https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-mainline-allyesconfig-build/110/artifact/artifacts
 
-Reproduce last good and first bad builds: https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/linux/sha1/1c6fdbd8f2465ddfb73a01ec620cbf3d14044e1a/tcwg_kernel/llvm-master-arm-mainline-allyesconfig/reproduction_instructions.txt
+Instruction to reproduce the build : https://gitlab.com/LinaroLtd/tcwg/ci/interesting-commits/-/raw/master/linux/sha1/1c6fdbd8f2465ddfb73a01ec620cbf3d14044e1a/tcwg_kernel/llvm-master-arm-mainline-allyesconfig/reproduction_instructions.txt
 
 Full commit : https://git.linaro.org/kernel-org/linux.git/commit/?id=1c6fdbd8f2465ddfb73a01ec620cbf3d14044e1a
 
-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/linux/sha1/1c6fdbd8f2465ddfb73a01ec620cbf3d14044e1a/tcwg_kernel/llvm-master-aarch64-mainline-allyesconfig/details.txt
-*** https://ci.linaro.org/job/tcwg_kernel--llvm-master-aarch64-mainline-allyesconfig-build/102/artifact/artifacts
-** llvm-master-arm-mainline-allmodconfig
-*** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/linux/sha1/1c6fdbd8f2465ddfb73a01ec620cbf3d14044e1a/tcwg_kernel/llvm-master-arm-mainline-allmodconfig/details.txt
-*** https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-mainline-allmodconfig-build/110/artifact/artifacts
-** llvm-master-arm-mainline-allyesconfig
-*** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/linux/sha1/1c6fdbd8f2465ddfb73a01ec620cbf3d14044e1a/tcwg_kernel/llvm-master-arm-mainline-allyesconfig/details.txt
-*** https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-mainline-allyesconfig-build/111/artifact/artifacts
-
