diff --git a/_config b/_config
index e9f13d7..399a6d6 100644
--- a/_config
+++ b/_config
@@ -3929,9 +3929,17 @@ Macros:
 
 Prefer: -go1.18-openssl
 
-# Required after gcc SR#322365
-Prefer: -cpp
-Prefer: -gcc-c++
+# Split between customer facing and internal compiler see gcc SR#322365
+Prefer: cpp-build
+Substitute: gcc gcc-build
+Substitute: gcc-c++ gcc-build-c++
+Substitute: gcc-32bit gcc-build-32bit
+Substitute: gcc-c++-32bit gcc-build-c++-32bit
+Substitute: gcc-PIE gcc-build-PIE
+Substitute: cpp cpp-build
+Substitute: libstdc++-devel libstdc++-build-devel
+Substitute: libstdc++-devel-32bit libstdc++-build-devel-32bit
+Substitute: libgccjit-devel libgccjit-build-devel
 
 # aggregate packages on i586 and standard from Workbench
 BuildFlags: excludebuild:rpmlint-mini-AGGR