diff --git a/misc/config_tools/board_inspector/extractors/10-processors.py b/misc/config_tools/board_inspector/extractors/10-processors.py
index 77612bd32..e6c504bce 100644
--- a/misc/config_tools/board_inspector/extractors/10-processors.py
+++ b/misc/config_tools/board_inspector/extractors/10-processors.py
@@ -74,8 +74,8 @@ def extract_topology(processors_node):
         while True:
             leaf_topo = parse_cpuid(topo_leaf, subleaf, cpu_id)
             if leaf_topo.level_type == 0:
-                if last_node.tag != "package":
-                    n, _ = get_or_create_parent(processors_node, "die", "0")
+                if last_node.tag != level_types[-1]:
+                    n, _ = get_or_create_parent(processors_node, level_types[-1], "0x0")
                     n.append(last_node)
                     last_node = n
                 processors_node.append(last_node)
diff --git a/misc/config_tools/xforms/board_info.h.xsl b/misc/config_tools/xforms/board_info.h.xsl
index 87da38ce4..5018aeef6 100644
--- a/misc/config_tools/xforms/board_info.h.xsl
+++ b/misc/config_tools/xforms/board_info.h.xsl
@@ -61,7 +61,7 @@
   </xsl:template>
 
   <xsl:template name="MAX_PCPU_NUM">
-    <xsl:value-of select="acrn:define('MAX_PCPU_NUM', count(//processors/die/core/thread), 'U')" />
+    <xsl:value-of select="acrn:define('MAX_PCPU_NUM', count(//processors//thread), 'U')" />
   </xsl:template>
 
   <xsl:template name="MAX_VMSIX_ON_MSI_PDEVS_NUM">