diff --git a/meta-oniro-core/conf/distro/include/oniro.inc b/meta-oniro-core/conf/distro/include/oniro.inc
index 1f50269def2c982aeae20c93a0406787d49237a8..66c8074cd3450db7bdf6e0f731be2007c5f00173 100644
--- a/meta-oniro-core/conf/distro/include/oniro.inc
+++ b/meta-oniro-core/conf/distro/include/oniro.inc
@@ -2,6 +2,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+ONIRO_FLAVOUR = "${@'${ONIRO_FLAVOUR_PRETTY}'.lower()}"
+DISTRO = "oniro-${ONIRO_FLAVOUR}"
+DISTRO_NAME = "Oniro Project Base ${ONIRO_FLAVOUR} Distro"
+
 require conf/distro/include/security_flags.inc
 
 INHERIT += "oniro-sanity"
diff --git a/meta-oniro-core/conf/distro/oniro-freertos.conf b/meta-oniro-core/conf/distro/oniro-freertos.conf
index 9421ed3e312a0f233a804eea286ff3003492fbb6..6ec72abdc78a96123c68a23a0949fd9be1501611 100644
--- a/meta-oniro-core/conf/distro/oniro-freertos.conf
+++ b/meta-oniro-core/conf/distro/oniro-freertos.conf
@@ -5,6 +5,5 @@
 require conf/distro/freertos.conf
 require conf/distro/include/oniro.inc
 
-DISTRO = "oniro-freertos"
-DISTRO_NAME = "Oniro Project Base FreeRTOS Distro"
+ONIRO_FLAVOUR_PRETTY = "FreeRTOS"
 DISTRO_VERSION = "2.0.0-alpha"
diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf
index dba12a3644d8c52fa1889bd1fef509ca9686ce2c..1667d080ffec036d62cf80649fb4de9647b2bf7b 100644
--- a/meta-oniro-core/conf/distro/oniro-linux.conf
+++ b/meta-oniro-core/conf/distro/oniro-linux.conf
@@ -2,8 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-DISTRO = "oniro-linux"
-DISTRO_NAME = "Oniro Project Base Linux Distro"
+ONIRO_FLAVOUR_PRETTY = "Linux"
 DISTRO_VERSION = "2.0.0-alpha"
 DISTRO_CODENAME = "dev"
 SDK_VENDOR = "-onirosdk"
diff --git a/meta-oniro-core/conf/distro/oniro-zephyr.conf b/meta-oniro-core/conf/distro/oniro-zephyr.conf
index 88c8a2999babd91e8f1336f39261374fa15980aa..a159249017a662f365f24b360803caf5b668d86a 100644
--- a/meta-oniro-core/conf/distro/oniro-zephyr.conf
+++ b/meta-oniro-core/conf/distro/oniro-zephyr.conf
@@ -5,6 +5,5 @@
 require conf/distro/include/oniro.inc
 require conf/distro/zephyr.conf
 
-DISTRO = "oniro-zephyr"
-DISTRO_NAME = "Oniro Project Base Zephyr Distro"
+ONIRO_FLAVOUR_PRETTY = "Zephyr"
 DISTRO_VERSION = "2.0.0-alpha"