diff --git a/tools/devices/hosted/darwin-arm64.xml b/tools/devices/hosted/darwin-arm64.xml
new file mode 100644
index 0000000000..5d2d79aa7f
--- /dev/null
+++ b/tools/devices/hosted/darwin-arm64.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ {platform}-{family}-{arch}
+
+
+
+
+
+
+
+
diff --git a/tools/devices/hosted/darwin.xml b/tools/devices/hosted/darwin-x86_64.xml
similarity index 86%
rename from tools/devices/hosted/darwin.xml
rename to tools/devices/hosted/darwin-x86_64.xml
index 7ac1b5b7a9..b2db0d85d6 100644
--- a/tools/devices/hosted/darwin.xml
+++ b/tools/devices/hosted/darwin-x86_64.xml
@@ -1,7 +1,7 @@
-
+
{platform}-{family}
diff --git a/tools/devices/hosted/linux-arm64.xml b/tools/devices/hosted/linux-arm64.xml
new file mode 100644
index 0000000000..50ec66b0af
--- /dev/null
+++ b/tools/devices/hosted/linux-arm64.xml
@@ -0,0 +1,14 @@
+
+
+
+
+ {platform}-{family}-{arch}
+
+
+
+
+
+
+
+
+
diff --git a/tools/devices/hosted/linux.xml b/tools/devices/hosted/linux-x86_64.xml
similarity index 88%
rename from tools/devices/hosted/linux.xml
rename to tools/devices/hosted/linux-x86_64.xml
index d0e5221a72..8bb6e90bc3 100644
--- a/tools/devices/hosted/linux.xml
+++ b/tools/devices/hosted/linux-x86_64.xml
@@ -1,7 +1,7 @@
-
+
{platform}-{family}
diff --git a/tools/devices/hosted/windows.xml b/tools/devices/hosted/windows.xml
index 79c2c0c27b..06eb4450e9 100644
--- a/tools/devices/hosted/windows.xml
+++ b/tools/devices/hosted/windows.xml
@@ -1,7 +1,7 @@
-
+
{platform}-{family}