diff --git a/configs/pioarduino_start.txt b/configs/pioarduino_start.txt
index ec10a10dc..03c52dc14 100644
--- a/configs/pioarduino_start.txt
+++ b/configs/pioarduino_start.txt
@@ -36,6 +36,7 @@ FRAMEWORK_SDK_DIR = env.PioPlatform().get_package_dir(
 )
 
 board_config = env.BoardConfig()
+build_mcu = board_config.get("build.mcu", "").lower()
 
 flatten_cppdefines = env.Flatten(env['CPPDEFINES'])
 
@@ -46,11 +47,16 @@ if "ZIGBEE_MODE_ZCZR" in flatten_cppdefines:
     env.Append(
         LIBS=[
             "-lesp_zb_api.zczr",
-            "-lzboss_stack.zczr",
+            "-lzboss_stack.zczr"
+        ]
+    )
+if "ZIGBEE_MODE_ZCZR" in flatten_cppdefines and build_mcu in ["esp32c5", "esp32c6", "esp32h2"]:
+    env.Append(
+        LIBS=[
             "-lzboss_port.native"
         ]
     )
-if "ZIGBEE_MODE_ED" in flatten_cppdefines:
+if "ZIGBEE_MODE_ED" in flatten_cppdefines and build_mcu in ["esp32c5", "esp32c6", "esp32h2"]:
     env.Append(
         LIBS=[
             "-lesp_zb_api.ed",
@@ -58,5 +64,11 @@ if "ZIGBEE_MODE_ED" in flatten_cppdefines:
             "-lzboss_port.native"
         ]
     )
+if ("ZIGBEE_MODE_ZCZR" in flatten_cppdefines or "ZIGBEE_MODE_ED" in flatten_cppdefines) and build_mcu in ["esp32", "esp32s2", "esp32s3", "esp32c3", "esp32c5", "esp32c6"]:
+    env.Append(
+        LIBS=[
+            "-libzboss_port.remote"
+        ]
+    )
 
 env.Append(