diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
index 5c76566f7c4e9d..6438d540ad0b7a 100644
--- a/.github/workflows/examples-efr32.yaml
+++ b/.github/workflows/examples-efr32.yaml
@@ -114,7 +114,7 @@ jobs:
           ./scripts/run_in_build_env.sh \
              "./scripts/build/build_examples.py \
                 --enable-flashbundle \
-                --target efr32-brd4338a-light-wifi-917-soc-skip-rps-generation \
+                --target efr32-brd4338a-light-wifi-917_soc-skip_rps_generation \
                 build \
                 --copy-artifacts-to out/artifacts \
              "
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 8ac082a82b0cae..6e9983700a0df7 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -605,7 +605,7 @@
                 "efr32-brd4186a-window-covering",
                 "efr32-brd4187a-window-covering",
                 "efr32-brd4304a-window-covering",
-                "efr32-brd4338a-light-wifi-917-soc-skip-rps-generation",
+                "efr32-brd4338a-light-wifi-917_soc-skip_rps_generation",
                 "esp32-c3devkit-all-clusters",
                 "esp32-devkitc-all-clusters",
                 "esp32-devkitc-all-clusters-ipv6only",
diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py
index bc5c5784eed4ec..21d06872444562 100755
--- a/scripts/build/build/targets.py
+++ b/scripts/build/build/targets.py
@@ -263,7 +263,7 @@ def BuildEfr32Target():
     target.AppendModifier('rs911x', enable_rs911x=True).OnlyIfRe('-wifi')
     target.AppendModifier('wf200', enable_wf200=True).OnlyIfRe('-wifi')
     target.AppendModifier('wifi_ipv4', enable_wifi_ipv4=True).OnlyIfRe('-wifi')
-    target.AppendModifier('917-soc', enable_917_soc=True).OnlyIfRe('-wifi')
+    target.AppendModifier('917_soc', enable_917_soc=True).OnlyIfRe('-wifi')
     target.AppendModifier('additional_data_advertising',
                           enable_additional_data_advertising=True)
     target.AppendModifier('use_ot_lib', enable_ot_lib=True).ExceptIfRe(
@@ -271,7 +271,7 @@ def BuildEfr32Target():
     target.AppendModifier('use_ot_coap_lib', enable_ot_coap_lib=True).ExceptIfRe(
         '-(wifi|use_ot_lib)')
     target.AppendModifier('no-version', no_version=True)
-    target.AppendModifier('skip-rps-generation', use_rps_extension=False)
+    target.AppendModifier('skip_rps_generation', use_rps_extension=False)
 
     return target
 
diff --git a/scripts/build/testdata/all_targets_linux_x64.txt b/scripts/build/testdata/all_targets_linux_x64.txt
index b24dfcb4b1025f..d82643bab99fa3 100644
--- a/scripts/build/testdata/all_targets_linux_x64.txt
+++ b/scripts/build/testdata/all_targets_linux_x64.txt
@@ -6,7 +6,7 @@ cc32xx-{lock,air-purifier}
 ti-cc13x2x7_26x2x7-{lighting,lock,pump,pump-controller}[-mtd]
 ti-cc13x4_26x4-{all-clusters,lighting,lock,pump,pump-controller}[-mtd][-ftd]
 cyw30739-cyw930739m2evb_01-{light,lock,ota-requestor,switch}
-efr32-{brd4161a,brd4187c,brd4186c,brd4163a,brd4164a,brd4166a,brd4170a,brd4186a,brd4187a,brd4304a,brd4338a}-{window-covering,switch,unit-test,light,lock,thermostat,pump}[-rpc][-with-ota-requestor][-icd][-low-power][-shell][-no_logging][-openthread_mtd][-enable_heap_monitoring][-no_openthread_cli][-show_qr_code][-wifi][-rs911x][-wf200][-wifi_ipv4][-additional_data_advertising][-use_ot_lib][-use_ot_coap_lib][-no-version][-917-soc][-skip-rps-generation]
+efr32-{brd4161a,brd4187c,brd4186c,brd4163a,brd4164a,brd4166a,brd4170a,brd4186a,brd4187a,brd4304a,brd4338a}-{window-covering,switch,unit-test,light,lock,thermostat,pump}[-rpc][-with-ota-requestor][-icd][-low-power][-shell][-no_logging][-openthread_mtd][-enable_heap_monitoring][-no_openthread_cli][-show_qr_code][-wifi][-rs911x][-wf200][-wifi_ipv4][-additional_data_advertising][-use_ot_lib][-use_ot_coap_lib][-no-version][-917_soc][-skip_rps_generation]
 esp32-{m5stack,c3devkit,devkitc,qemu}-{all-clusters,all-clusters-minimal,ota-provider,ota-requestor,shell,light,lock,bridge,temperature-measurement,ota-requestor,tests}[-rpc][-ipv6only][-tracing]
 genio-lighting-app
 linux-fake-tests[-mbedtls][-boringssl][-asan][-tsan][-ubsan][-libfuzzer][-ossfuzz][-coverage][-dmalloc][-clang]