diff --git a/Buildscripts/DevicetreeCompiler/source/generator.py b/Buildscripts/DevicetreeCompiler/source/generator.py
index 04f89eeeb..d372357bc 100644
--- a/Buildscripts/DevicetreeCompiler/source/generator.py
+++ b/Buildscripts/DevicetreeCompiler/source/generator.py
@@ -20,8 +20,10 @@ def write_define(file, define: DefineC, verbose: bool):
 def get_device_node_name_safe(device: Device):
     if device.node_name == "/":
         return "root"
-    else:
-        return device.node_name.replace("-", "_")
+    name = device.node_name.replace("-", "_")
+    if device.node_address is not None:
+        name += "_" + device.node_address.replace("-", "_")
+    return name
 
 def get_device_type_name(device: Device, bindings: list[Binding]):
     device_binding = find_device_binding(device, bindings)
diff --git a/Buildscripts/DevicetreeCompiler/tests/data/expected_devicetree.c b/Buildscripts/DevicetreeCompiler/tests/data/expected_devicetree.c
index 207ecff44..866ed3544 100644
--- a/Buildscripts/DevicetreeCompiler/tests/data/expected_devicetree.c
+++ b/Buildscripts/DevicetreeCompiler/tests/data/expected_devicetree.c
@@ -10,6 +10,7 @@ static const root_config_dt root_config = {
 };
 
 static struct Device root = {
+    .address = 0,
 	.name = "/",
 	.config = &root_config,
 	.parent = NULL,