diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 95624f5dcb090d..bb2f3415b892b5 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -215,12 +215,11 @@
                 "android-arm64-chip-tool",
                 "android-x64-chip-tool",
                 "android-x86-chip-tool",
-                "efr32-brd4161a-light-light-rpc",
-                "efr32-brd4161a-light-light",
-                "efr32-brd4161a-light-lock-rpc",
-                "efr32-brd4161a-light-lock",
-                "efr32-brd4161a-light-window-covering-rpc",
-                "efr32-brd4161a-light-window-covering",
+                "efr32-brd4161a-light-rpc",
+                "efr32-brd4161a-light",
+                "efr32-brd4161a-lock-rpc",
+                "efr32-brd4161a-lock",
+                "efr32-brd4161a-window-covering",
                 "esp32-c3devkit-all-clusters",
                 "esp32-devkitc-all-clusters",
                 "esp32-devkitc-bridge",
diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py
index fbad861042e5a2..a818e7930caaf9 100644
--- a/scripts/build/build/targets.py
+++ b/scripts/build/build/targets.py
@@ -95,16 +95,17 @@ def Esp32Targets():
 
 
 def Efr32Targets():
-    target = Target('efr32-brd4161a-light', Efr32Builder,
-                    board=Efr32Board.BRD4161A)
+    efr_target = Target('efr32-brd4161a', Efr32Builder,
+                        board=Efr32Board.BRD4161A)
 
-    targets = [
-        target.Extend('light', app=Efr32App.LIGHT),
-        target.Extend('lock', app=Efr32App.LOCK),
-        target.Extend('window-covering', app=Efr32App.WINDOW_COVERING),
+    yield efr_target.Extend('window-covering', app=Efr32App.WINDOW_COVERING)
+
+    rpc_aware_targets = [
+        efr_target.Extend('light', app=Efr32App.LIGHT),
+        efr_target.Extend('lock', app=Efr32App.LOCK),
     ]
 
-    for target in targets:
+    for target in rpc_aware_targets:
         yield target
         yield target.Extend('rpc', enable_rpcs=True)
 
diff --git a/scripts/build/testdata/all_targets_except_host.txt b/scripts/build/testdata/all_targets_except_host.txt
index 54561d7024721b..a9a1ee98709136 100644
--- a/scripts/build/testdata/all_targets_except_host.txt
+++ b/scripts/build/testdata/all_targets_except_host.txt
@@ -2,12 +2,11 @@ android-arm-chip-tool
 android-arm64-chip-tool
 android-x64-chip-tool
 android-x86-chip-tool
-efr32-brd4161a-light-light
-efr32-brd4161a-light-light-rpc
-efr32-brd4161a-light-lock
-efr32-brd4161a-light-lock-rpc
-efr32-brd4161a-light-window-covering
-efr32-brd4161a-light-window-covering-rpc
+efr32-brd4161a-light
+efr32-brd4161a-light-rpc
+efr32-brd4161a-lock
+efr32-brd4161a-lock-rpc
+efr32-brd4161a-window-covering
 esp32-c3devkit-all-clusters
 esp32-devkitc-all-clusters
 esp32-devkitc-bridge
diff --git a/scripts/build/testdata/build_all_except_host.txt b/scripts/build/testdata/build_all_except_host.txt
index 6d8ada00b873f6..f563f5cea6ccfa 100644
--- a/scripts/build/testdata/build_all_except_host.txt
+++ b/scripts/build/testdata/build_all_except_host.txt
@@ -46,23 +46,20 @@ gn gen --check --fail-on-unused-args {out}/android-x86-chip-tool '--args=target_
 # Accepting NDK licenses
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
 
-# Generating efr32-brd4161a-light-light
-gn gen --check --fail-on-unused-args --root={root}/examples/lighting-app/efr32 '--args=efr32_board="BRD4161A"' {out}/efr32-brd4161a-light-light
+# Generating efr32-brd4161a-light
+gn gen --check --fail-on-unused-args --root={root}/examples/lighting-app/efr32 '--args=efr32_board="BRD4161A"' {out}/efr32-brd4161a-light
 
-# Generating efr32-brd4161a-light-light-rpc
-gn gen --check --fail-on-unused-args --root={root}/examples/lighting-app/efr32 '--args=efr32_board="BRD4161A" import("//with_pw_rpc.gni")' {out}/efr32-brd4161a-light-light-rpc
+# Generating efr32-brd4161a-light-rpc
+gn gen --check --fail-on-unused-args --root={root}/examples/lighting-app/efr32 '--args=efr32_board="BRD4161A" import("//with_pw_rpc.gni")' {out}/efr32-brd4161a-light-rpc
 
-# Generating efr32-brd4161a-light-lock
-gn gen --check --fail-on-unused-args --root={root}/examples/lock-app/efr32 '--args=efr32_board="BRD4161A"' {out}/efr32-brd4161a-light-lock
+# Generating efr32-brd4161a-lock
+gn gen --check --fail-on-unused-args --root={root}/examples/lock-app/efr32 '--args=efr32_board="BRD4161A"' {out}/efr32-brd4161a-lock
 
-# Generating efr32-brd4161a-light-lock-rpc
-gn gen --check --fail-on-unused-args --root={root}/examples/lock-app/efr32 '--args=efr32_board="BRD4161A" import("//with_pw_rpc.gni")' {out}/efr32-brd4161a-light-lock-rpc
+# Generating efr32-brd4161a-lock-rpc
+gn gen --check --fail-on-unused-args --root={root}/examples/lock-app/efr32 '--args=efr32_board="BRD4161A" import("//with_pw_rpc.gni")' {out}/efr32-brd4161a-lock-rpc
 
-# Generating efr32-brd4161a-light-window-covering
-gn gen --check --fail-on-unused-args --root={root}/examples/window-app/efr32 '--args=efr32_board="BRD4161A"' {out}/efr32-brd4161a-light-window-covering
-
-# Generating efr32-brd4161a-light-window-covering-rpc
-gn gen --check --fail-on-unused-args --root={root}/examples/window-app/efr32 '--args=efr32_board="BRD4161A" import("//with_pw_rpc.gni")' {out}/efr32-brd4161a-light-window-covering-rpc
+# Generating efr32-brd4161a-window-covering
+gn gen --check --fail-on-unused-args --root={root}/examples/window-app/efr32 '--args=efr32_board="BRD4161A"' {out}/efr32-brd4161a-window-covering
 
 # Generating esp32-c3devkit-all-clusters
 cd "{root}"
@@ -249,23 +246,20 @@ cp {out}/android-x86-chip-tool/lib/src/platform/android/AndroidPlatform.jar {roo
 # Building APP android-x86-chip-tool
 {root}/src/android/CHIPTool/gradlew -p {root}/src/android/CHIPTool -PbuildDir={out}/android-x86-chip-tool assembleDebug
 
-# Building efr32-brd4161a-light-light
-ninja -C {out}/efr32-brd4161a-light-light
-
-# Building efr32-brd4161a-light-light-rpc
-ninja -C {out}/efr32-brd4161a-light-light-rpc
+# Building efr32-brd4161a-light
+ninja -C {out}/efr32-brd4161a-light
 
-# Building efr32-brd4161a-light-lock
-ninja -C {out}/efr32-brd4161a-light-lock
+# Building efr32-brd4161a-light-rpc
+ninja -C {out}/efr32-brd4161a-light-rpc
 
-# Building efr32-brd4161a-light-lock-rpc
-ninja -C {out}/efr32-brd4161a-light-lock-rpc
+# Building efr32-brd4161a-lock
+ninja -C {out}/efr32-brd4161a-lock
 
-# Building efr32-brd4161a-light-window-covering
-ninja -C {out}/efr32-brd4161a-light-window-covering
+# Building efr32-brd4161a-lock-rpc
+ninja -C {out}/efr32-brd4161a-lock-rpc
 
-# Building efr32-brd4161a-light-window-covering-rpc
-ninja -C {out}/efr32-brd4161a-light-window-covering-rpc
+# Building efr32-brd4161a-window-covering
+ninja -C {out}/efr32-brd4161a-window-covering
 
 # Building esp32-c3devkit-all-clusters
 bash -c 'source $IDF_PATH/export.sh; ninja -C '"'"'{out}/esp32-c3devkit-all-clusters'"'"''