diff --git a/meta-oniro-core/conf/distro/include/oniro.inc b/meta-oniro-core/conf/distro/include/oniro.inc
index f9c151a5bea10867dc7cb6747f30739d30fe667d..fa99e0d19a5674366863315fe372f2713b0ba898 100644
--- a/meta-oniro-core/conf/distro/include/oniro.inc
+++ b/meta-oniro-core/conf/distro/include/oniro.inc
@@ -11,6 +11,12 @@ INHERIT += "oniro-sanity"
 # them only the blueprint distributions.
 BBMASK += "oniro/meta-oniro-blueprints/"
 
+# Default versions of toolchain components
+# (can be overridden in kernel specific files if necessary)
+BINUVERSION ?= "2.37%"
+GCCVERSION ?= "11.%"
+GLIBCVERSION ?= "2.33%"
+
 # This is the ugliest fix possible but it fixes the build while keeping
 # meta-freertos around. meta-freertos is pulling in a dependency on
 # meta-poky-bsp without a reason that we can put a finger on and given that we
diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf
index 871a1ce4d8d6e961f5e60fb704e616dda291eca6..dc17c029ee37e66afd478ecdd6962cda402ee72f 100644
--- a/meta-oniro-core/conf/distro/oniro-linux.conf
+++ b/meta-oniro-core/conf/distro/oniro-linux.conf
@@ -93,10 +93,6 @@ require conf/distro/include/oniro-wic.inc
 
 TCLIBC ?= "musl"
 
-BINUVERSION ?= "2.37%"
-GCCVERSION ?= "11.%"
-GLIBCVERSION ?= "2.33%"
-
 INIT_MANAGER = "systemd"
 
 # Remove some of the default Poky DISTRO_FEATURES we inherited, but do not use.