diff --git a/_config b/_config
index 159efa0..eb9a548 100644
--- a/_config
+++ b/_config
@@ -3932,10 +3932,16 @@ Prefer: -go1.18-openssl
 # Split between customer facing and internal compiler see gcc SR#322365
 Prefer: cpp-build
 Prefer: gcc-build-c++ gcc-build
+Prefer: libstdc++-build-devel
 Substitute: gcc gcc-build
-Substitute: gcc-c++ gcc-build-c++
 Substitute: gcc-32bit gcc-build-32bit
+Substitute: gcc-ada gcc-build-ada
+Substitute: gcc-ada-32bit gcc-build-ada-32bit
+Substitute: gcc-c++ gcc-build-c++
 Substitute: gcc-c++-32bit gcc-build-c++-32bit
+Substitute: gcc-go gcc-build-go
+Substitute: gcc-fortran gcc-build-fortran
+Substitute: gcc-objc gcc-build-objc
 Substitute: gcc-PIE gcc-build-PIE
 Substitute: cpp cpp-build
 Substitute: libstdc++-devel libstdc++-build-devel