diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf
index 84278f574ac20433025a33cb57c8fa66c33ec7f0..dba12a3644d8c52fa1889bd1fef509ca9686ce2c 100644
--- a/meta-oniro-core/conf/distro/oniro-linux.conf
+++ b/meta-oniro-core/conf/distro/oniro-linux.conf
@@ -120,3 +120,6 @@ IMAGE_LOG_CHECK_EXCLUDES:libc-musl += "Failed opening /etc/nsswitch.conf"
 # We run a read-only rootfs but we want shadow because it includes subid
 # configuration used by podman in rootless mode.
 ROOTFS_RO_UNNEEDED:remove = "shadow"
+
+# Set default hostname to reflect the DISTRO
+hostname:pn-base-files = "${DISTRO}-${MACHINE}"