diff --git a/thunderbird.spec b/thunderbird.spec
index b054a59..650ebe8 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -88,7 +88,7 @@ end}
 
 %if 0%{?rhel} > 7 && 0%{?rhel} < 10
   %global use_gcc_ts      1
-  %if 0%{?rhel} == 9 && %{rhel_minor_version} >= 6
+  %if (0%{?rhel} == 9 && %{rhel_minor_version} >= 6) || (0%{?rhel} == 8 && %{rhel_minor_version} >= 10)
     # clang depends on gcc-toolset-14-gcc-c++
     %global gts_version 14
   %else
@@ -333,8 +333,9 @@ BuildRequires: gcc-toolset-%{gts_version}-runtime
 BuildRequires: gcc-toolset-%{gts_version}-binutils
 BuildRequires: gcc-toolset-%{gts_version}-gcc
 BuildRequires: gcc-toolset-%{gts_version}-gcc-plugin-annobin
-# Do not explicitly require gcc-toolset-%%{gts_version}-gcc-g++ instead fail
+# Do not explicitly require gcc-toolset-%%{gts_version}-gcc-c++ instead fail
 # when clang is upgraded to depend on a later toolset and adjust version.
+# ERROR: The target C compiler is version 13.3.1, while the target C++ compiler is version 8.5.0. Need to use the same compiler version.
 %endif
 
 %if %{?use_openssl_for_librnp}