diff --git a/scripts/build_and_test/build_app.py b/scripts/build_and_test/build_app.py
index 28645e5..7f23ed6 100644
--- a/scripts/build_and_test/build_app.py
+++ b/scripts/build_and_test/build_app.py
@@ -94,13 +94,13 @@ def build_all_devices(devices: Devices, sdk_path: Path, app_json: dict, workdir:
 
     stax_output, stax_log = build_device(devices.stax, variant_param, app_build_path, sdk_path, app_json)
 
-    if nanos_output:
+    if nanos_output and devices.nanos.selected:
         output["build"]["nanos"] = nanos_output
-    if nanosp_output:
+    if nanosp_output and devices.nanosp.selected:
         output["build"]["nanosp"] = nanosp_output
-    if nanox_output:
+    if nanox_output and devices.nanox.selected:
         output["build"]["nanox"] = nanox_output
-    if stax_output:
+    if stax_output and devices.stax.selected:
         output["build"]["stax"] = stax_output
 
     log = nanos_log + nanosp_log + nanox_log + stax_log
diff --git a/scripts/build_and_test/scan_app.py b/scripts/build_and_test/scan_app.py
index 96affe6..618df26 100644
--- a/scripts/build_and_test/scan_app.py
+++ b/scripts/build_and_test/scan_app.py
@@ -89,13 +89,13 @@ def scan_all_devices(devices: Devices, sdk_path: Path, app_json: dict, workdir:
 
     stax_output, stax_log = scan_device(devices.stax, variant_param, app_build_path, sdk_path, app_json)
 
-    if nanos_output:
+    if nanos_output and devices.nanos.selected:
         output["scan"]["nanos"] = nanos_output
-    if nanosp_output:
+    if nanosp_output and devices.nanosp.selected:
         output["scan"]["nanosp"] = nanosp_output
-    if nanox_output:
+    if nanox_output and devices.nanox.selected:
         output["scan"]["nanox"] = nanox_output
-    if stax_output:
+    if stax_output and devices.stax.selected:
         output["scan"]["stax"] = stax_output
 
     log = nanos_log + nanosp_log + nanox_log + stax_log
diff --git a/scripts/build_and_test/test_app.py b/scripts/build_and_test/test_app.py
index 42cf39d..e0f00b0 100644
--- a/scripts/build_and_test/test_app.py
+++ b/scripts/build_and_test/test_app.py
@@ -87,13 +87,13 @@ def test_all_devices(devices: Devices, sdk_path: Path, app_json: dict, workdir:
     stax_output, stax_log = test_device(devices.stax, variant_param, app_build_path, app_test_path,
                                         sdk_path, extra_flags, blacklist, test_params)
 
-    if nanos_output:
+    if nanos_output and devices.nanos.selected:
         output["test"]["nanos"] = nanos_output
-    if nanosp_output:
+    if nanosp_output and devices.nanosp.selected:
         output["test"]["nanosp"] = nanosp_output
-    if nanox_output:
+    if nanox_output and devices.nanox.selected:
         output["test"]["nanox"] = nanox_output
-    if stax_output:
+    if stax_output and devices.stax.selected:
         output["test"]["stax"] = stax_output
     print(output)