diff --git a/examples/chef/efr32/.gn b/examples/chef/efr32/.gn
index ae71c73f3c06aa..291da0198d8cc8 100644
--- a/examples/chef/efr32/.gn
+++ b/examples/chef/efr32/.gn
@@ -25,7 +25,5 @@ default_args = {
   target_cpu = "arm"
   target_os = "freertos"
   chip_openthread_ftd = true
-  openthread_external_platform =
-      "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
   import("//args.gni")
 }
diff --git a/examples/chef/efr32/BUILD.gn b/examples/chef/efr32/BUILD.gn
index cdde6c204a71f0..efaace05910a0b 100644
--- a/examples/chef/efr32/BUILD.gn
+++ b/examples/chef/efr32/BUILD.gn
@@ -206,13 +206,9 @@ efr32_executable("chef_app") {
   # OpenThread Settings
   if (chip_enable_openthread) {
     deps += [
-      "${chip_root}/third_party/openthread:openthread_device_deps",
+      "${chip_root}/third_party/openthread:openthread",
       "${examples_plat_dir}:efr-matter-shell",
     ]
-
-    if (enable_openthread_cli) {
-      deps += [ "${efr32_sdk_build_root}:openthread_cli" ]
-    }
   }
 
   if (chip_enable_ota_requestor) {
diff --git a/examples/chef/efr32/args.gni b/examples/chef/efr32/args.gni
index 7d077dce704c2f..6f6b3d248ee53b 100644
--- a/examples/chef/efr32/args.gni
+++ b/examples/chef/efr32/args.gni
@@ -24,3 +24,5 @@ pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
 pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
 pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
 chip_enable_openthread = true
+openthread_external_platform =
+  "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
diff --git a/examples/light-switch-app/efr32/.gn b/examples/light-switch-app/efr32/.gn
index ae71c73f3c06aa..291da0198d8cc8 100644
--- a/examples/light-switch-app/efr32/.gn
+++ b/examples/light-switch-app/efr32/.gn
@@ -25,7 +25,5 @@ default_args = {
   target_cpu = "arm"
   target_os = "freertos"
   chip_openthread_ftd = true
-  openthread_external_platform =
-      "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
   import("//args.gni")
 }
diff --git a/examples/light-switch-app/efr32/BUILD.gn b/examples/light-switch-app/efr32/BUILD.gn
index 4a5bd7b9b959bd..026dc46d13195c 100644
--- a/examples/light-switch-app/efr32/BUILD.gn
+++ b/examples/light-switch-app/efr32/BUILD.gn
@@ -199,13 +199,9 @@ efr32_executable("light_switch_app") {
   # OpenThread Settings
   if (chip_enable_openthread) {
     deps += [
-      "${chip_root}/third_party/openthread:openthread_device_deps",
+      "${chip_root}/third_party/openthread:openthread",
       "${examples_plat_dir}:efr-matter-shell",
     ]
-
-    if (enable_openthread_cli) {
-      deps += [ "${efr32_sdk_build_root}:openthread_cli" ]
-    }
   }
 
   # Attestation Credentials
diff --git a/examples/light-switch-app/efr32/args.gni b/examples/light-switch-app/efr32/args.gni
index 7df1c5e400f56f..8e1885d95d18d4 100644
--- a/examples/light-switch-app/efr32/args.gni
+++ b/examples/light-switch-app/efr32/args.gni
@@ -24,3 +24,5 @@ pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
 pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
 chip_enable_openthread = true
 pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
+openthread_external_platform =
+    "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
diff --git a/examples/lighting-app/efr32/.gn b/examples/lighting-app/efr32/.gn
index ae71c73f3c06aa..291da0198d8cc8 100644
--- a/examples/lighting-app/efr32/.gn
+++ b/examples/lighting-app/efr32/.gn
@@ -25,7 +25,5 @@ default_args = {
   target_cpu = "arm"
   target_os = "freertos"
   chip_openthread_ftd = true
-  openthread_external_platform =
-      "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
   import("//args.gni")
 }
diff --git a/examples/lighting-app/efr32/BUILD.gn b/examples/lighting-app/efr32/BUILD.gn
index 05833cfe8ffca9..15f6e0171c5aaa 100644
--- a/examples/lighting-app/efr32/BUILD.gn
+++ b/examples/lighting-app/efr32/BUILD.gn
@@ -204,13 +204,10 @@ efr32_executable("lighting_app") {
   # OpenThread Settings
   if (chip_enable_openthread) {
     deps += [
-      "${chip_root}/third_party/openthread:openthread_device_deps",
+      "${chip_root}/third_party/openthread:openthread",
       "${examples_plat_dir}:efr-matter-shell",
     ]
 
-    if (enable_openthread_cli) {
-      deps += [ "${efr32_sdk_build_root}:openthread_cli" ]
-    }
   }
 
   if (chip_enable_ota_requestor) {
diff --git a/examples/lighting-app/efr32/args.gni b/examples/lighting-app/efr32/args.gni
index 7df1c5e400f56f..9121d153beeb5c 100644
--- a/examples/lighting-app/efr32/args.gni
+++ b/examples/lighting-app/efr32/args.gni
@@ -24,3 +24,6 @@ pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
 pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
 chip_enable_openthread = true
 pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
+
+openthread_external_platform =
+  "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
\ No newline at end of file
diff --git a/examples/lock-app/efr32/.gn b/examples/lock-app/efr32/.gn
index ae71c73f3c06aa..291da0198d8cc8 100644
--- a/examples/lock-app/efr32/.gn
+++ b/examples/lock-app/efr32/.gn
@@ -25,7 +25,5 @@ default_args = {
   target_cpu = "arm"
   target_os = "freertos"
   chip_openthread_ftd = true
-  openthread_external_platform =
-      "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
   import("//args.gni")
 }
diff --git a/examples/lock-app/efr32/BUILD.gn b/examples/lock-app/efr32/BUILD.gn
index 3f341496608e2c..c98bebfed6d942 100644
--- a/examples/lock-app/efr32/BUILD.gn
+++ b/examples/lock-app/efr32/BUILD.gn
@@ -201,13 +201,9 @@ efr32_executable("lock_app") {
   # OpenThread Settings
   if (chip_enable_openthread) {
     deps += [
-      "${chip_root}/third_party/openthread:openthread_device_deps",
+      "${chip_root}/third_party/openthread:openthread",
       "${examples_plat_dir}:efr-matter-shell",
     ]
-
-    if (enable_openthread_cli) {
-      deps += [ "${efr32_sdk_build_root}:openthread_cli" ]
-    }
   }
 
   if (chip_enable_ota_requestor) {
diff --git a/examples/lock-app/efr32/args.gni b/examples/lock-app/efr32/args.gni
index b4a0322c442f40..9ff5e1fd3992f1 100644
--- a/examples/lock-app/efr32/args.gni
+++ b/examples/lock-app/efr32/args.gni
@@ -24,3 +24,5 @@ chip_enable_openthread = true
 pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
 pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
 pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
+openthread_external_platform =
+    "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
diff --git a/examples/platform/efr32/BUILD.gn b/examples/platform/efr32/BUILD.gn
index b6551ed6d090a9..d1522f93d6d686 100644
--- a/examples/platform/efr32/BUILD.gn
+++ b/examples/platform/efr32/BUILD.gn
@@ -46,7 +46,7 @@ source_set("openthread_core_config_efr32_chip_examples") {
 
     public_deps = [ "${efr32_sdk_build_root}:efr32_sdk" ]
 
-    if (use_silabs_thread_lib == true) {
+    if (use_silabs_thread_lib) {
       public_deps += [ "${efr32_sdk_build_root}:openthread_core_config_efr32" ]
     } else {
       public_deps += [ "${chip_root}/third_party/openthread/platforms/efr32:openthread_core_config_efr32" ]
diff --git a/examples/thermostat/efr32/BUILD.gn b/examples/thermostat/efr32/BUILD.gn
index ac491a2ab04e7c..fe2be76adf88a8 100644
--- a/examples/thermostat/efr32/BUILD.gn
+++ b/examples/thermostat/efr32/BUILD.gn
@@ -195,13 +195,9 @@ efr32_executable("thermostat_app") {
   # OpenThread Settings
   if (chip_enable_openthread) {
     deps += [
-      "${chip_root}/third_party/openthread:openthread_device_deps",
+      "${chip_root}/third_party/openthread:openthread",
       "${examples_plat_dir}:efr-matter-shell",
     ]
-
-    if (enable_openthread_cli) {
-      deps += [ "${efr32_sdk_build_root}:openthread_cli" ]
-    }
   }
 
   # Attestation Credentials
diff --git a/examples/window-app/efr32/.gn b/examples/window-app/efr32/.gn
index ae71c73f3c06aa..291da0198d8cc8 100644
--- a/examples/window-app/efr32/.gn
+++ b/examples/window-app/efr32/.gn
@@ -25,7 +25,5 @@ default_args = {
   target_cpu = "arm"
   target_os = "freertos"
   chip_openthread_ftd = true
-  openthread_external_platform =
-      "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
   import("//args.gni")
 }
diff --git a/examples/window-app/efr32/BUILD.gn b/examples/window-app/efr32/BUILD.gn
index f295c14d19d9e6..bcd17e3b6dddcf 100644
--- a/examples/window-app/efr32/BUILD.gn
+++ b/examples/window-app/efr32/BUILD.gn
@@ -187,13 +187,9 @@ efr32_executable("window_app") {
   # OpenThread Settings
   if (chip_enable_openthread) {
     deps += [
-      "${chip_root}/third_party/openthread:openthread_device_deps",
+      "${chip_root}/third_party/openthread:openthread",
       "${examples_plat_dir}:efr-matter-shell",
     ]
-
-    if (enable_openthread_cli) {
-      deps += [ "${efr32_sdk_build_root}:openthread_cli" ]
-    }
   }
 
   if (chip_enable_ota_requestor) {
diff --git a/examples/window-app/efr32/args.gni b/examples/window-app/efr32/args.gni
index 0b7ef403df72cd..26f97a8076d141 100644
--- a/examples/window-app/efr32/args.gni
+++ b/examples/window-app/efr32/args.gni
@@ -23,3 +23,5 @@ chip_enable_ota_requestor = true
 pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
 pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
 chip_enable_openthread = true
+openthread_external_platform =
+    "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
diff --git a/src/inet/BUILD.gn b/src/inet/BUILD.gn
index f539ee6139648f..7f3c76cb76a6cf 100644
--- a/src/inet/BUILD.gn
+++ b/src/inet/BUILD.gn
@@ -109,7 +109,7 @@ static_library("inet") {
 
   if (chip_system_config_use_open_thread_inet_endpoints) {
     public_deps +=
-        [ "${chip_root}/third_party/openthread:openthread_device_deps" ]
+        [ "${chip_root}/third_party/openthread:openthread" ]
   }
 
   if (chip_inet_config_enable_tcp_endpoint) {
diff --git a/src/platform/EFR32/BUILD.gn b/src/platform/EFR32/BUILD.gn
index 73cda01e955f26..9f89fb128c911f 100644
--- a/src/platform/EFR32/BUILD.gn
+++ b/src/platform/EFR32/BUILD.gn
@@ -99,7 +99,9 @@ static_library("EFR32") {
   ]
   if (chip_enable_openthread) {
     public_deps +=
-        [ "${chip_root}/third_party/openthread:openthread_device_deps" ]
+        [ "${chip_root}/third_party/openthread:openthread" ]
+
+    deps += [ "${chip_root}/third_party/silabs:openthread_cli" ]
 
     sources += [
       "../OpenThread/OpenThreadUtils.cpp",
diff --git a/src/test_driver/efr32/.gn b/src/test_driver/efr32/.gn
index ea000c8c2bef29..2c4e61509ee369 100644
--- a/src/test_driver/efr32/.gn
+++ b/src/test_driver/efr32/.gn
@@ -24,7 +24,5 @@ check_system_includes = true
 default_args = {
   target_cpu = "arm"
   target_os = "freertos"
-  openthread_external_platform =
-      "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
   import("//args.gni")
 }
diff --git a/src/test_driver/efr32/BUILD.gn b/src/test_driver/efr32/BUILD.gn
index ebba9b292a5667..45e4aff6fe40a7 100644
--- a/src/test_driver/efr32/BUILD.gn
+++ b/src/test_driver/efr32/BUILD.gn
@@ -95,13 +95,9 @@ efr32_executable("efr32_device_tests") {
   # OpenThread Settings
   if (chip_enable_openthread) {
     deps += [
-      "${chip_root}/third_party/openthread:openthread_device_deps",
+      "${chip_root}/third_party/openthread:openthread",
       "${examples_plat_dir}:efr-matter-shell",
     ]
-
-    if (enable_openthread_cli) {
-      deps += [ "${efr32_sdk_build_root}:openthread_cli" ]
-    }
   }
 
   deps += pw_build_LINK_DEPS
diff --git a/src/test_driver/efr32/args.gni b/src/test_driver/efr32/args.gni
index 8addd1383ed934..8db9c5e87eb212 100644
--- a/src/test_driver/efr32/args.gni
+++ b/src/test_driver/efr32/args.gni
@@ -27,6 +27,9 @@ chip_enable_openthread = true
 chip_openthread_ftd = true
 chip_monolithic_tests = true
 
+openthread_external_platform =
+    "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"
+
 #Fix me : Test driver should use same config as examples
 # Problem : Linker issue if set to true
 chip_system_config_use_open_thread_inet_endpoints = false
diff --git a/third_party/openthread/BUILD.gn b/third_party/openthread/BUILD.gn
index 7c25798474cedc..752f245738a750 100644
--- a/third_party/openthread/BUILD.gn
+++ b/third_party/openthread/BUILD.gn
@@ -8,7 +8,7 @@ declare_args() {
   chip_openthread_target = ""
 }
 
-group("openthread_device_deps") {
+group("openthread") {
   if (chip_openthread_target != "") {
     public_deps = [ chip_openthread_target ]
   } else {
diff --git a/third_party/silabs/BUILD.gn b/third_party/silabs/BUILD.gn
index f847171e020902..c4f96d18d339f5 100644
--- a/third_party/silabs/BUILD.gn
+++ b/third_party/silabs/BUILD.gn
@@ -33,7 +33,7 @@ group("efr32_sdk") {
 
 if (chip_enable_openthread) {
   group("openthread_cli") {
-    if (use_silabs_thread_lib == false) {
+    if (!use_silabs_thread_lib) {
       if (chip_openthread_ftd) {
         public_deps = [ "${sl_openthread_root}:libopenthread-cli-ftd" ]
       } else {
@@ -151,7 +151,7 @@ if (use_silabs_thread_lib) {
 
     # selected thread device type FTD or MTD
     XTD = "ftd"
-    if (chip_openthread_ftd == false) {
+    if (!chip_openthread_ftd) {
       XTD = "mtd"
     }