diff --git a/.gitlab-ci/gitlab-ci.yml.in b/.gitlab-ci/gitlab-ci.yml.in
index 27b479c5b3..6e02b6e0f9 100644
--- a/.gitlab-ci/gitlab-ci.yml.in
+++ b/.gitlab-ci/gitlab-ci.yml.in
@@ -22,7 +22,7 @@
         paths:
             - build/*.config
             - build/*-build.log
-            - build/*.tar.bz2
+            - build/*.tar.xz
             - build/*.sha256
             - build/README.txt
             - build/summary.csv
@@ -55,7 +55,7 @@
         expire_in: 2 weeks
         paths:
             - test/*.config
-            - test/*.tar.bz2
+            - test/*.tar.xz
             - test/*.sha256
             - test/*-test-result.txt
             - test/*-test-build.log
diff --git a/build-toolchain.sh b/build-toolchain.sh
index 713449ad7d..1f88b86606 100755
--- a/build-toolchain.sh
+++ b/build-toolchain.sh
@@ -148,7 +148,7 @@ function make_br_fragment {
     echo "BR2_TOOLCHAIN_EXTERNAL=y" >> ${fragment_file}
     echo "BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y" >> ${fragment_file}
     echo "BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y" >> ${fragment_file}
-    echo "BR2_TOOLCHAIN_EXTERNAL_URL=\"${base_url}/toolchains/${arch_name}/tarballs/${release_name}.tar.bz2\"" >> ${fragment_file}
+    echo "BR2_TOOLCHAIN_EXTERNAL_URL=\"${base_url}/toolchains/${arch_name}/tarballs/${release_name}.tar.xz\"" >> ${fragment_file}
     echo "BR2_TOOLCHAIN_EXTERNAL_GCC_${gcc_version}=y" >> ${fragment_file}
     echo "BR2_TOOLCHAIN_EXTERNAL_HEADERS_${linux_version}=y" >> ${fragment_file}
     if [ "${locale}" == "y" ]; then
@@ -274,10 +274,10 @@ follow these steps:
 EOF
 
     # Make the tarball
-    echo "Packaging the toolchain as ${release_name}.tar.bz2"
+    echo "Packaging the toolchain as ${release_name}.tar.xz"
     cd ${build_dir}
-    tar cjf `basename ${release_name}`.tar.bz2 `basename ${toolchain_dir}`
-    sha256sum ${release_name}.tar.bz2 > ${release_name}.sha256
+    tar cJf `basename ${release_name}`.tar.xz `basename ${toolchain_dir}`
+    sha256sum ${release_name}.tar.xz > ${release_name}.sha256
 
     cp ${readme_file} ${build_dir}/README.txt
     cp ${summary_file} ${build_dir}/summary.csv
diff --git a/test-toolchain.sh b/test-toolchain.sh
index 125e187484..335232bf7a 100755
--- a/test-toolchain.sh
+++ b/test-toolchain.sh
@@ -311,13 +311,13 @@ function get_buildroot {
 function extract_toolchain {
     mkdir -p ${toolchain_dir}
 
-    if ! test -e ${build_dir}/${release_name}.tar.bz2 ; then
-        echo "Artifacts ${release_name}.tar.bz2 missing"
+    if ! test -e ${build_dir}/${release_name}.tar.xz ; then
+        echo "Artifacts ${release_name}.tar.xz missing"
         exit 1
     fi
 
     echo "Extracting toolchain tarball"
-    tar --strip-components=1 -C ${toolchain_dir} -xf ${build_dir}/${release_name}.tar.bz2
+    tar --strip-components=1 -C ${toolchain_dir} -xf ${build_dir}/${release_name}.tar.xz
 }
 
 function main {
diff --git a/upload-toolchain.sh b/upload-toolchain.sh
index 530de26de2..893cfa1671 100755
--- a/upload-toolchain.sh
+++ b/upload-toolchain.sh
@@ -70,7 +70,7 @@ function main {
     rsync ${build_dir}/summary.csv \
 	  ${ssh_server}:${upload_folder}/summaries/${release_name}.csv
     # Toolchain tarball
-    rsync ${build_dir}/${release_name}.tar.bz2 \
+    rsync ${build_dir}/${release_name}.tar.xz \
 	  ${ssh_server}:${upload_folder}/tarballs/
     # Toolchain tarball checksum
     rsync ${build_dir}/${release_name}.sha256 \