diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml
index 77177cece..91eb2690e 100644
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -52,12 +52,6 @@ permissions: read-all
 
 jobs:
   setup:
-    strategy:
-      fail-fast: true
-      matrix:
-        arch:
-          - all
-          - check
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v7
@@ -72,16 +66,15 @@ jobs:
           # PRs and (for now) merge_group builds use the narrowed --level pr board
           # subset. Full-matrix builds run on push / schedule / workflow_dispatch.
           if [[ "$GITHUB_EVENT_NAME" == "pull_request" || "$GITHUB_EVENT_NAME" == "merge_group" ]]; then
-            TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}} --level pr)
+            TARGETS=$(./bin/generate_ci_matrix.py all --level pr)
           else
-            TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}})
+            TARGETS=$(./bin/generate_ci_matrix.py all)
           fi
           echo "Name: $GITHUB_REF_NAME Base: $GITHUB_BASE_REF Ref: $GITHUB_REF"
-          echo "${{matrix.arch}}=$TARGETS" >> $GITHUB_OUTPUT
+          echo "all=$TARGETS" >> $GITHUB_OUTPUT
           echo "$TARGETS" >> $GITHUB_STEP_SUMMARY
     outputs:
       all: ${{ steps.jsonStep.outputs.all }}
-      check: ${{ steps.jsonStep.outputs.check }}
 
   version:
     runs-on: ubuntu-latest
@@ -103,7 +96,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        check: ${{ fromJson(needs.setup.outputs.check) }}
+        check: ${{ fromJson(needs.setup.outputs.all) }}
     # Runs on GitHub-hosted runners so checks don't compete with builds for the
     # self-hosted 'arctastic' pool (which builds use).
     runs-on: ubuntu-latest
diff --git a/bin/generate_ci_matrix.py b/bin/generate_ci_matrix.py
index cb19fd1b6..c3235c279 100755
--- a/bin/generate_ci_matrix.py
+++ b/bin/generate_ci_matrix.py
@@ -60,31 +60,21 @@ for pio_env in pio_envs:
   env = {
     "ci": {"board": pio_env, "platform": env_platform},
     "board_level": board_level,
-    "board_check": cfg.get(f"env:{pio_env}", "board_check", default="false").strip().lower() == "true",
   }
   all_envs.append(env)
 
-# Filter outputs based on options
-# Check is mutually exclusive with other options (except 'pr')
-if "check" in args.platform:
-  for env in all_envs:
-    if env["board_check"]:
-      # '--level pr' narrows to the PR subset; otherwise check every level
-      if "pr" not in args.level or env["board_level"] == "pr":
-        outlist.append(env["ci"])
-# Filter (non-check) builds by platform
-else:
-  for env in all_envs:
-    if args.platform == env["ci"]["platform"] or args.platform == "all":
-      # Always include board_level = 'pr'
-      if env["board_level"] == "pr":
-        outlist.append(env["ci"])
-      # Include board_level = 'extra' when requested
-      elif "extra" in args.level and env["board_level"] == "extra":
-        outlist.append(env["ci"])
-      # Include board_level = 'release' unless narrowed to the PR subset
-      elif "pr" not in args.level and env["board_level"] == "release":
-        outlist.append(env["ci"])
+# Filter builds by platform
+for env in all_envs:
+  if args.platform == env["ci"]["platform"] or args.platform == "all":
+    # Always include board_level = 'pr'
+    if env["board_level"] == "pr":
+      outlist.append(env["ci"])
+    # Include board_level = 'extra' when requested
+    elif "extra" in args.level and env["board_level"] == "extra":
+      outlist.append(env["ci"])
+    # Include board_level = 'release' unless narrowed to the PR subset
+    elif "pr" not in args.level and env["board_level"] == "release":
+      outlist.append(env["ci"])
 
 # Return as a JSON list
 print(json.dumps(outlist))
diff --git a/variants/esp32/diy/v1/platformio.ini b/variants/esp32/diy/v1/platformio.ini
index 1d1fcebfa..7b7519d29 100644
--- a/variants/esp32/diy/v1/platformio.ini
+++ b/variants/esp32/diy/v1/platformio.ini
@@ -12,7 +12,6 @@ custom_meshtastic_tags = DIY
 extends = esp32_base
 board_level = release
 board = esp32doit-devkit-v1
-board_check = true
 build_flags =
   ${esp32_base.build_flags}
   -D DIY_V1
diff --git a/variants/esp32/m5stack_coreink/platformio.ini b/variants/esp32/m5stack_coreink/platformio.ini
index a68daab69..9d31c50ed 100644
--- a/variants/esp32/m5stack_coreink/platformio.ini
+++ b/variants/esp32/m5stack_coreink/platformio.ini
@@ -2,7 +2,6 @@
 extends = esp32_base
 board_level = release
 board = m5stack-coreink
-board_check = true
 build_src_filter = 
   ${esp32_base.build_src_filter}
 build_flags = 
diff --git a/variants/esp32/rak11200/platformio.ini b/variants/esp32/rak11200/platformio.ini
index 8d2416000..96cb36c88 100644
--- a/variants/esp32/rak11200/platformio.ini
+++ b/variants/esp32/rak11200/platformio.ini
@@ -11,7 +11,6 @@ custom_meshtastic_tags = RAK
 extends = esp32_base
 board_level = release
 board = wiscore_rak11200
-board_check = true
 build_flags = 
   ${esp32_base.build_flags}
   -D RAK_11200
diff --git a/variants/esp32/tbeam/platformio.ini b/variants/esp32/tbeam/platformio.ini
index f1d9ad465..79277f840 100644
--- a/variants/esp32/tbeam/platformio.ini
+++ b/variants/esp32/tbeam/platformio.ini
@@ -13,7 +13,6 @@ extends = esp32_base
 board_level = release
 board = ttgo-tbeam
 
-board_check = true
 build_flags = ${esp32_base.build_flags}
   -D TBEAM_V10
   -I variants/esp32/tbeam
diff --git a/variants/esp32/tlora_v2_1_16/platformio.ini b/variants/esp32/tlora_v2_1_16/platformio.ini
index 529ad5783..6d8ce7339 100644
--- a/variants/esp32/tlora_v2_1_16/platformio.ini
+++ b/variants/esp32/tlora_v2_1_16/platformio.ini
@@ -11,7 +11,6 @@ custom_meshtastic_tags = LilyGo
 extends = esp32_base
 board_level = release
 board = ttgo-lora32-v21
-board_check = true
 build_flags = 
   ${esp32_base.build_flags} -D TLORA_V2_1_16 -I variants/esp32/tlora_v2_1_16
 upload_speed = 115200
diff --git a/variants/esp32s2/nugget_s2_lora/platformio.ini b/variants/esp32s2/nugget_s2_lora/platformio.ini
index 91b0664e9..a091a705f 100644
--- a/variants/esp32s2/nugget_s2_lora/platformio.ini
+++ b/variants/esp32s2/nugget_s2_lora/platformio.ini
@@ -2,7 +2,6 @@
 extends = esp32s2_base
 board = lolin_s2_mini
 board_level = extra
-board_check = true
 build_flags = 
   ${esp32s2_base.build_flags}
   -D PRIVATE_HW
diff --git a/variants/esp32s3/elecrow_panel/platformio.ini b/variants/esp32s3/elecrow_panel/platformio.ini
index cbe5059bd..28a4dc248 100644
--- a/variants/esp32s3/elecrow_panel/platformio.ini
+++ b/variants/esp32s3/elecrow_panel/platformio.ini
@@ -1,7 +1,6 @@
 [crowpanel_base]
 extends = esp32s3_base
 board = crowpanel
-board_check = true
 upload_protocol = esptool
 board_build.partitions = default_16MB.csv ; must be here for some reason, board.json is not enough !?
 build_flags = ${esp32s3_base.build_flags} -Os
diff --git a/variants/esp32s3/hackaday-communicator/platformio.ini b/variants/esp32s3/hackaday-communicator/platformio.ini
index 5259045c7..c803fcf77 100644
--- a/variants/esp32s3/hackaday-communicator/platformio.ini
+++ b/variants/esp32s3/hackaday-communicator/platformio.ini
@@ -3,7 +3,6 @@
 extends = esp32s3_base
 board_level = release
 board = hackaday-communicator
-board_check = true
 board_build.partitions = default_16MB.csv
 upload_protocol = esptool
 
diff --git a/variants/esp32s3/heltec_capsule_sensor_v3/platformio.ini b/variants/esp32s3/heltec_capsule_sensor_v3/platformio.ini
index 79bd64bf6..aca96337a 100644
--- a/variants/esp32s3/heltec_capsule_sensor_v3/platformio.ini
+++ b/variants/esp32s3/heltec_capsule_sensor_v3/platformio.ini
@@ -2,7 +2,6 @@
 extends = esp32s3_base
 board_level = release
 board = heltec_wifi_lora_32_V3
-board_check = true
 board_build.partitions = default_8MB.csv
 build_flags = 
   ${esp32s3_base.build_flags} -I variants/esp32s3/heltec_capsule_sensor_v3
diff --git a/variants/esp32s3/heltec_sensor_hub/platformio.ini b/variants/esp32s3/heltec_sensor_hub/platformio.ini
index 83b4e1565..2e5a0551f 100644
--- a/variants/esp32s3/heltec_sensor_hub/platformio.ini
+++ b/variants/esp32s3/heltec_sensor_hub/platformio.ini
@@ -2,7 +2,6 @@
 extends = esp32s3_base
 board_level = release
 board = heltec_wifi_lora_32_V3
-board_check = true
 
 build_flags = 
   ${esp32s3_base.build_flags}
diff --git a/variants/esp32s3/heltec_v3/platformio.ini b/variants/esp32s3/heltec_v3/platformio.ini
index 2f53c8756..2a25815f8 100644
--- a/variants/esp32s3/heltec_v3/platformio.ini
+++ b/variants/esp32s3/heltec_v3/platformio.ini
@@ -12,7 +12,6 @@ custom_meshtastic_partition_scheme = 8MB
 extends = esp32s3_base
 board = heltec_wifi_lora_32_V3
 board_level = pr
-board_check = true
 board_build.partitions = default_8MB.csv
 build_flags = 
   ${esp32s3_base.build_flags}
diff --git a/variants/esp32s3/heltec_v4/platformio.ini b/variants/esp32s3/heltec_v4/platformio.ini
index 06434a73b..185a31187 100644
--- a/variants/esp32s3/heltec_v4/platformio.ini
+++ b/variants/esp32s3/heltec_v4/platformio.ini
@@ -1,7 +1,6 @@
 [heltec_v4_base] 
 extends = esp32s3_base
 board = heltec_v4
-board_check = true
 board_build.partitions = default_16MB.csv
 build_flags = 
   ${esp32s3_base.build_flags}
diff --git a/variants/esp32s3/heltec_v4_r8/platformio.ini b/variants/esp32s3/heltec_v4_r8/platformio.ini
index f0437f5aa..0d3fd7616 100644
--- a/variants/esp32s3/heltec_v4_r8/platformio.ini
+++ b/variants/esp32s3/heltec_v4_r8/platformio.ini
@@ -1,7 +1,6 @@
 [heltec_v4_r8_base] 
 extends = esp32s3_base
 board = heltec_v4_r8
-board_check = true
 board_build.partitions = default_16MB.csv
 build_flags = 
   ${esp32s3_base.build_flags}
diff --git a/variants/esp32s3/icarus/platformio.ini b/variants/esp32s3/icarus/platformio.ini
index de29cc2cf..9c4974cea 100644
--- a/variants/esp32s3/icarus/platformio.ini
+++ b/variants/esp32s3/icarus/platformio.ini
@@ -2,7 +2,6 @@
 extends = esp32s3_base
 board = icarus
 board_level = extra
-board_check = true
 board_build.mcu = esp32s3
 board_build.partitions = default_8MB.csv
 upload_protocol = esptool
diff --git a/variants/esp32s3/m5stack_cardputer_adv/platformio.ini b/variants/esp32s3/m5stack_cardputer_adv/platformio.ini
index a0e42eae4..dcd597302 100644
--- a/variants/esp32s3/m5stack_cardputer_adv/platformio.ini
+++ b/variants/esp32s3/m5stack_cardputer_adv/platformio.ini
@@ -3,7 +3,6 @@
 extends = esp32s3_base
 board_level = release
 board = m5stack-stamps3
-board_check = true
 board_build.partitions = default_8MB.csv
 upload_protocol = esptool
 build_flags = 
diff --git a/variants/esp32s3/m5stack_cores3/platformio.ini b/variants/esp32s3/m5stack_cores3/platformio.ini
index f18d00231..5f2d01f82 100644
--- a/variants/esp32s3/m5stack_cores3/platformio.ini
+++ b/variants/esp32s3/m5stack_cores3/platformio.ini
@@ -3,7 +3,6 @@
 extends = esp32s3_base
 board_level = release
 board = m5stack-cores3
-board_check = true
 board_build.partitions = default_16MB.csv
 upload_protocol = esptool
 build_flags = 
diff --git a/variants/esp32s3/mini-epaper-s3/platformio.ini b/variants/esp32s3/mini-epaper-s3/platformio.ini
index ea6c331e2..e7daf63e0 100644
--- a/variants/esp32s3/mini-epaper-s3/platformio.ini
+++ b/variants/esp32s3/mini-epaper-s3/platformio.ini
@@ -13,7 +13,6 @@ custom_meshtastic_has_mui = false
 extends = esp32s3_base
 board_level = release
 board = mini-epaper-s3
-board_check = true
 upload_protocol = esptool
 
 build_flags = 
@@ -40,7 +39,6 @@ lib_deps =
 extends = esp32s3_base, inkhud
 board_level = release
 board = mini-epaper-s3
-board_check = true
 upload_protocol = esptool
 build_src_filter =
   ${esp32s3_base.build_src_filter}
diff --git a/variants/esp32s3/picomputer-s3/platformio.ini b/variants/esp32s3/picomputer-s3/platformio.ini
index 4e632bbd2..e40726da3 100644
--- a/variants/esp32s3/picomputer-s3/platformio.ini
+++ b/variants/esp32s3/picomputer-s3/platformio.ini
@@ -11,7 +11,6 @@ custom_meshtastic_has_mui = true
 extends = esp32s3_base
 board_level = release
 board = bpi_picow_esp32_s3
-board_check = true
 board_build.partitions = partition-table-8MB.csv
 ;OpenOCD flash method
 ;upload_protocol = esp-builtin
diff --git a/variants/esp32s3/rak3312/platformio.ini b/variants/esp32s3/rak3312/platformio.ini
index 2ebf87cb1..ca2d70279 100644
--- a/variants/esp32s3/rak3312/platformio.ini
+++ b/variants/esp32s3/rak3312/platformio.ini
@@ -14,7 +14,6 @@ custom_meshtastic_has_mui = false
 extends = esp32s3_base
 board_level = release
 board = wiscore_rak3312
-board_check = true
 upload_protocol = esptool
 
 build_flags = 
diff --git a/variants/esp32s3/rak_wismesh_tap_v2/platformio.ini b/variants/esp32s3/rak_wismesh_tap_v2/platformio.ini
index 871c0f4d4..dcbc93040 100644
--- a/variants/esp32s3/rak_wismesh_tap_v2/platformio.ini
+++ b/variants/esp32s3/rak_wismesh_tap_v2/platformio.ini
@@ -25,7 +25,6 @@ custom_meshtastic_has_mui = true
 extends = esp32s3_base
 board_level = release
 board = wiscore_rak3312
-board_check = true
 upload_protocol = esptool
 board_build.partitions = default_16MB.csv
 
diff --git a/variants/esp32s3/seeed-sensecap-indicator/platformio.ini b/variants/esp32s3/seeed-sensecap-indicator/platformio.ini
index 6850943cf..d34cb655c 100644
--- a/variants/esp32s3/seeed-sensecap-indicator/platformio.ini
+++ b/variants/esp32s3/seeed-sensecap-indicator/platformio.ini
@@ -18,7 +18,6 @@ platform_packages =
 
 board = seeed-sensecap-indicator
 board_level = release
-board_check = true
 board_build.partitions = partition-table-8MB.csv
 upload_protocol = esptool
 
@@ -45,7 +44,6 @@ lib_deps = ${esp32s3_base.lib_deps}
 [env:seeed-sensecap-indicator-tft]
 extends = env:seeed-sensecap-indicator
 board_level = pr
-board_check = true
 upload_speed = 921600
 
 build_flags =
diff --git a/variants/esp32s3/seeed_xiao_s3/platformio.ini b/variants/esp32s3/seeed_xiao_s3/platformio.ini
index 2a0e0f0e8..140f7660c 100644
--- a/variants/esp32s3/seeed_xiao_s3/platformio.ini
+++ b/variants/esp32s3/seeed_xiao_s3/platformio.ini
@@ -13,7 +13,6 @@ custom_meshtastic_partition_scheme = 8MB
 extends = esp32s3_base
 board_level = release
 board = seeed-xiao-s3
-board_check = true
 board_build.partitions = default_8MB.csv
 upload_protocol = esptool
 upload_speed = 921600
diff --git a/variants/esp32s3/station-g2/platformio.ini b/variants/esp32s3/station-g2/platformio.ini
index ab94cc6cd..2b4d849b7 100755
--- a/variants/esp32s3/station-g2/platformio.ini
+++ b/variants/esp32s3/station-g2/platformio.ini
@@ -13,7 +13,6 @@ custom_meshtastic_partition_scheme = 16MB
 extends = esp32s3_base
 board_level = release
 board = station-g2
-board_check = true
 board_build.partitions = default_16MB.csv
 board_build.mcu = esp32s3
 upload_protocol = esptool
diff --git a/variants/esp32s3/station-g3/platformio.ini b/variants/esp32s3/station-g3/platformio.ini
index 910e70ae1..f09da13bc 100644
--- a/variants/esp32s3/station-g3/platformio.ini
+++ b/variants/esp32s3/station-g3/platformio.ini
@@ -13,7 +13,6 @@ custom_meshtastic_partition_scheme = 16MB
 extends = esp32s3_base
 board_level = release
 board = station-g3
-board_check = true
 board_build.partitions = default_16MB.csv
 board_build.mcu = esp32s3
 upload_protocol = esptool
diff --git a/variants/esp32s3/t-beam-1w/platformio.ini b/variants/esp32s3/t-beam-1w/platformio.ini
index aef36a854..74921e4c1 100644
--- a/variants/esp32s3/t-beam-1w/platformio.ini
+++ b/variants/esp32s3/t-beam-1w/platformio.ini
@@ -14,7 +14,6 @@ extends = esp32s3_base
 board_level = release
 board = t-beam-1w
 board_build.partitions = default_8MB.csv
-board_check = true
 
 lib_deps =
   ${esp32s3_base.lib_deps}
diff --git a/variants/esp32s3/t-beam-bpf/platformio.ini b/variants/esp32s3/t-beam-bpf/platformio.ini
index 291ddde7b..103cde8ae 100644
--- a/variants/esp32s3/t-beam-bpf/platformio.ini
+++ b/variants/esp32s3/t-beam-bpf/platformio.ini
@@ -13,7 +13,6 @@ extends = esp32s3_base
 board_level = release
 board = t-beam-bpf
 board_build.partitions = default_16MB.csv
-board_check = true
 
 lib_deps =
   ${esp32s3_base.lib_deps}
diff --git a/variants/esp32s3/t-deck-pro-v1_1/platformio.ini b/variants/esp32s3/t-deck-pro-v1_1/platformio.ini
index d7b5a3b3e..c5dc14a7c 100644
--- a/variants/esp32s3/t-deck-pro-v1_1/platformio.ini
+++ b/variants/esp32s3/t-deck-pro-v1_1/platformio.ini
@@ -13,7 +13,6 @@ custom_meshtastic_partition_scheme = 16MB
 extends = esp32s3_base
 board_level = release
 board = t-deck-pro
-board_check = true
 upload_protocol = esptool
 
 build_flags = 
diff --git a/variants/esp32s3/t-deck-pro/platformio.ini b/variants/esp32s3/t-deck-pro/platformio.ini
index f1a5c850b..bac234cc4 100644
--- a/variants/esp32s3/t-deck-pro/platformio.ini
+++ b/variants/esp32s3/t-deck-pro/platformio.ini
@@ -14,7 +14,6 @@ custom_meshtastic_has_mui = false
 extends = esp32s3_base
 board_level = release
 board = t-deck-pro
-board_check = true
 upload_protocol = esptool
 
 build_src_filter =
diff --git a/variants/esp32s3/t-deck/platformio.ini b/variants/esp32s3/t-deck/platformio.ini
index 29389c829..dadecc92f 100644
--- a/variants/esp32s3/t-deck/platformio.ini
+++ b/variants/esp32s3/t-deck/platformio.ini
@@ -15,7 +15,6 @@ custom_meshtastic_has_mui = true
 extends = esp32s3_base
 board_level = release
 board = t-deck
-board_check = true
 board_build.partitions = default_16MB.csv
 upload_protocol = esptool
 
diff --git a/variants/esp32s3/t-eth-elite/platformio.ini b/variants/esp32s3/t-eth-elite/platformio.ini
index 42369a63d..7b32dc56f 100644
--- a/variants/esp32s3/t-eth-elite/platformio.ini
+++ b/variants/esp32s3/t-eth-elite/platformio.ini
@@ -2,7 +2,6 @@
 extends = esp32s3_base
 board_level = release
 board = esp32s3box
-board_check = true
 board_build.partitions = default_16MB.csv
 build_flags = 
   ${esp32s3_base.build_flags}
diff --git a/variants/esp32s3/t-watch-s3/platformio.ini b/variants/esp32s3/t-watch-s3/platformio.ini
index 8bd212c4f..6f4542b0e 100644
--- a/variants/esp32s3/t-watch-s3/platformio.ini
+++ b/variants/esp32s3/t-watch-s3/platformio.ini
@@ -13,7 +13,6 @@ custom_meshtastic_partition_scheme = 8MB
 extends = esp32s3_base
 board_level = release
 board = t-watch-s3
-board_check = true
 board_build.partitions = default_16MB.csv
 upload_protocol = esptool
 
diff --git a/variants/esp32s3/t5s3_epaper/platformio.ini b/variants/esp32s3/t5s3_epaper/platformio.ini
index 9dd1cea71..d4ba00158 100644
--- a/variants/esp32s3/t5s3_epaper/platformio.ini
+++ b/variants/esp32s3/t5s3_epaper/platformio.ini
@@ -2,7 +2,6 @@
 extends = esp32s3_base
 board = t5-epaper-s3
 board_build.partitions = default_16MB.csv
-board_check = true
 upload_protocol = esptool
 build_flags = -fno-strict-aliasing
   ${esp32s3_base.build_flags} 
@@ -39,7 +38,6 @@ custom_sdkconfig =
 [env:t5s3_epaper_inkhud]
 extends = t5s3_epaper_base, inkhud
 board_level = extra
-board_check = true
 build_flags =
   ${t5s3_epaper_base.build_flags}
   ${inkhud.build_flags}
diff --git a/variants/esp32s3/tbeam-s3-core/platformio.ini b/variants/esp32s3/tbeam-s3-core/platformio.ini
index 259960622..b0421855c 100644
--- a/variants/esp32s3/tbeam-s3-core/platformio.ini
+++ b/variants/esp32s3/tbeam-s3-core/platformio.ini
@@ -15,7 +15,6 @@ extends = esp32s3_base
 board_level = release
 board = tbeam-s3-core
 board_build.partitions = default_8MB.csv
-board_check = true
 
 lib_deps =
   ${esp32s3_base.lib_deps}
diff --git a/variants/esp32s3/tlora-pager/platformio.ini b/variants/esp32s3/tlora-pager/platformio.ini
index 69acd9283..9b5a8dfa3 100644
--- a/variants/esp32s3/tlora-pager/platformio.ini
+++ b/variants/esp32s3/tlora-pager/platformio.ini
@@ -15,7 +15,6 @@ custom_meshtastic_has_mui = true
 extends = esp32s3_base
 board_level = release
 board = t-deck-pro ; same as T-Deck Pro
-board_check = true
 board_build.partitions = default_16MB.csv
 upload_protocol = esptool
 
diff --git a/variants/esp32s3/tlora_t3s3_epaper/platformio.ini b/variants/esp32s3/tlora_t3s3_epaper/platformio.ini
index 8d235c957..555aa61ef 100644
--- a/variants/esp32s3/tlora_t3s3_epaper/platformio.ini
+++ b/variants/esp32s3/tlora_t3s3_epaper/platformio.ini
@@ -13,7 +13,6 @@ custom_meshtastic_has_ink_hud = true
 extends = esp32s3_base
 board_level = release
 board = tlora-t3s3-v1
-board_check = true
 board_build.partitions = partition-table-t3s3.csv
 upload_protocol = esptool
 
@@ -42,7 +41,6 @@ lib_deps =
 extends = esp32s3_base, inkhud
 board_level = release
 board = tlora-t3s3-v1
-board_check = true
 board_build.partitions = partition-table-t3s3.csv
 upload_protocol = esptool
 custom_sdkconfig =
diff --git a/variants/esp32s3/tlora_t3s3_v1/platformio.ini b/variants/esp32s3/tlora_t3s3_v1/platformio.ini
index dfe40f46e..74a0ebde6 100644
--- a/variants/esp32s3/tlora_t3s3_v1/platformio.ini
+++ b/variants/esp32s3/tlora_t3s3_v1/platformio.ini
@@ -12,7 +12,6 @@ custom_meshtastic_requires_dfu = true
 extends = esp32s3_base
 board_level = release
 board = tlora-t3s3-v1
-board_check = true
 board_build.partitions = partition-table-t3s3.csv
 upload_protocol = esptool
 
diff --git a/variants/esp32s3/visualizer-hub75/platformio.ini b/variants/esp32s3/visualizer-hub75/platformio.ini
index fb321da26..99eba2c78 100644
--- a/variants/esp32s3/visualizer-hub75/platformio.ini
+++ b/variants/esp32s3/visualizer-hub75/platformio.ini
@@ -2,7 +2,6 @@
 [env:visualizer-hub75]
 extends = esp32s3_base
 board = esp32-s3-devkitc-1
-board_check = true
 board_build.partitions = default_16MB.csv
 board_level = extra
 board_upload.flash_size = 16MB          ; N16R8 -> 16MB flash
diff --git a/variants/nrf52840/ELECROW-ThinkNode-M1/platformio.ini b/variants/nrf52840/ELECROW-ThinkNode-M1/platformio.ini
index 5c35f6310..efdb9a393 100644
--- a/variants/nrf52840/ELECROW-ThinkNode-M1/platformio.ini
+++ b/variants/nrf52840/ELECROW-ThinkNode-M1/platformio.ini
@@ -13,7 +13,6 @@ custom_meshtastic_has_ink_hud = true
 extends = nrf52840_base
 board_level = release
 board = ThinkNode-M1
-board_check = true
 debug_tool = jlink
 
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
@@ -44,7 +43,6 @@ lib_deps =
 extends = nrf52840_base, inkhud
 board_level = release
 board = ThinkNode-M1
-board_check = true
 debug_tool = jlink
 build_flags = 
   ${nrf52840_base.build_flags}
diff --git a/variants/nrf52840/ELECROW-ThinkNode-M3/platformio.ini b/variants/nrf52840/ELECROW-ThinkNode-M3/platformio.ini
index d1d665f6c..1b36d2da9 100644
--- a/variants/nrf52840/ELECROW-ThinkNode-M3/platformio.ini
+++ b/variants/nrf52840/ELECROW-ThinkNode-M3/platformio.ini
@@ -6,7 +6,6 @@ custom_meshtastic_tags = Elecrow
 extends = nrf52840_base
 board_level = release
 board = ThinkNode-M3
-board_check = true
 debug_tool = jlink
 custom_meshtastic_hw_model = 115
 custom_meshtastic_hw_model_slug = THINKNODE_M3
diff --git a/variants/nrf52840/ELECROW-ThinkNode-M4/platformio.ini b/variants/nrf52840/ELECROW-ThinkNode-M4/platformio.ini
index 4495beba8..4c6de0e4e 100644
--- a/variants/nrf52840/ELECROW-ThinkNode-M4/platformio.ini
+++ b/variants/nrf52840/ELECROW-ThinkNode-M4/platformio.ini
@@ -3,7 +3,6 @@
 extends = nrf52840_base
 board_level = release
 board = ThinkNode-M4
-board_check = true
 debug_tool = jlink
 
 build_flags = ${nrf52840_base.build_flags}
diff --git a/variants/nrf52840/ELECROW-ThinkNode-M6/platformio.ini b/variants/nrf52840/ELECROW-ThinkNode-M6/platformio.ini
index 25a58bb62..3166494ce 100644
--- a/variants/nrf52840/ELECROW-ThinkNode-M6/platformio.ini
+++ b/variants/nrf52840/ELECROW-ThinkNode-M6/platformio.ini
@@ -12,7 +12,6 @@ custom_meshtastic_tags = Elecrow
 extends = nrf52840_base
 board_level = release
 board = ThinkNode-M6
-board_check = true
 debug_tool = jlink
 
 build_flags = ${nrf52840_base.build_flags}
diff --git a/variants/nrf52840/ELECROW-ThinkNode-M8/platformio.ini b/variants/nrf52840/ELECROW-ThinkNode-M8/platformio.ini
index e1c94381a..fa1f3cf11 100644
--- a/variants/nrf52840/ELECROW-ThinkNode-M8/platformio.ini
+++ b/variants/nrf52840/ELECROW-ThinkNode-M8/platformio.ini
@@ -12,7 +12,6 @@ custom_meshtastic_actively_supported = true
 extends = nrf52840_base
 board_level = release
 board = ThinkNode-M8
-board_check = true
 debug_tool = jlink
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = 
diff --git a/variants/nrf52840/gat562_mesh_trial_tracker/platformio.ini b/variants/nrf52840/gat562_mesh_trial_tracker/platformio.ini
index cecca3d81..cce5a25dc 100644
--- a/variants/nrf52840/gat562_mesh_trial_tracker/platformio.ini
+++ b/variants/nrf52840/gat562_mesh_trial_tracker/platformio.ini
@@ -3,7 +3,6 @@
 extends = nrf52840_base
 board_level = extra
 board = gat562_mesh_trial_tracker
-board_check = true
 build_flags = ${nrf52840_base.build_flags}
   -I variants/nrf52840/gat562_mesh_trial_tracker
   ;-D GAT562_MESH_TRIAL_TRACKER
diff --git a/variants/nrf52840/heltec_mesh_node_t114-inkhud/platformio.ini b/variants/nrf52840/heltec_mesh_node_t114-inkhud/platformio.ini
index fbdc999a3..6fbaa93fe 100644
--- a/variants/nrf52840/heltec_mesh_node_t114-inkhud/platformio.ini
+++ b/variants/nrf52840/heltec_mesh_node_t114-inkhud/platformio.ini
@@ -2,7 +2,6 @@
 board_level = extra
 extends = nrf52840_base, inkhud
 board = heltec_mesh_node_t114
-board_check = true
 build_flags = 
   ${nrf52840_base.build_flags}
   ${inkhud.build_flags}
diff --git a/variants/nrf52840/meshlink/platformio.ini b/variants/nrf52840/meshlink/platformio.ini
index f3dc6185c..3b12836b3 100644
--- a/variants/nrf52840/meshlink/platformio.ini
+++ b/variants/nrf52840/meshlink/platformio.ini
@@ -5,7 +5,6 @@
 extends = nrf52840_base
 board = meshlink
 board_level = extra
-;board_check = true
 build_flags = ${nrf52840_base.build_flags}
   -I variants/nrf52840/meshlink
   -D MESHLINK
@@ -24,7 +23,6 @@ debug_tool = jlink
 extends = nrf52840_base
 board = meshlink
 board_level = extra
-;board_check = true
 build_flags = ${nrf52840_base.build_flags}
   -I variants/nrf52840/meshlink
   -D MESHLINK
diff --git a/variants/nrf52840/r1-neo/platformio.ini b/variants/nrf52840/r1-neo/platformio.ini
index c79650bbc..8ffd18630 100644
--- a/variants/nrf52840/r1-neo/platformio.ini
+++ b/variants/nrf52840/r1-neo/platformio.ini
@@ -12,7 +12,6 @@ custom_meshtastic_tags = muzi
 extends = nrf52840_base
 board_level = release
 board = r1-neo
-board_check = true
 build_flags = ${nrf52840_base.build_flags}
   -Ivariants/nrf52840/r1-neo
   -D R1_NEO
diff --git a/variants/nrf52840/rak2560/platformio.ini b/variants/nrf52840/rak2560/platformio.ini
index 797e439c6..92c0ed717 100644
--- a/variants/nrf52840/rak2560/platformio.ini
+++ b/variants/nrf52840/rak2560/platformio.ini
@@ -12,7 +12,6 @@ custom_meshtastic_tags = RAK
 extends = nrf52840_base
 board_level = release
 board = wiscore_rak4631
-board_check = true
 build_flags = ${nrf52840_base.build_flags}
   -I variants/nrf52840/rak2560
   -D RAK_4631
diff --git a/variants/nrf52840/rak3401_1watt/platformio.ini b/variants/nrf52840/rak3401_1watt/platformio.ini
index e61223f00..c61aa9dac 100644
--- a/variants/nrf52840/rak3401_1watt/platformio.ini
+++ b/variants/nrf52840/rak3401_1watt/platformio.ini
@@ -13,7 +13,6 @@ custom_meshtastic_requires_dfu = true
 extends = nrf52840_base
 board_level = release
 board = wiscore_rak4631
-board_check = true
 build_flags = ${nrf52840_base.build_flags} 
   -Ivariants/nrf52840/rak3401_1watt
   -D RAK_4631
diff --git a/variants/nrf52840/rak4631/platformio.ini b/variants/nrf52840/rak4631/platformio.ini
index b45cdab4f..69eed83ea 100644
--- a/variants/nrf52840/rak4631/platformio.ini
+++ b/variants/nrf52840/rak4631/platformio.ini
@@ -12,7 +12,6 @@ custom_meshtastic_tags = RAK
 extends = nrf52840_base
 board = wiscore_rak4631
 board_level = pr
-board_check = true
 build_type = release
 build_flags = ${nrf52840_base.build_flags}
   -I variants/nrf52840/rak4631
diff --git a/variants/nrf52840/rak4631_eth_gw/platformio.ini b/variants/nrf52840/rak4631_eth_gw/platformio.ini
index 0509f0a1c..7bad13a88 100644
--- a/variants/nrf52840/rak4631_eth_gw/platformio.ini
+++ b/variants/nrf52840/rak4631_eth_gw/platformio.ini
@@ -3,7 +3,6 @@
 extends = nrf52840_base
 board_level = release
 board = wiscore_rak4631
-board_check = true
 build_flags = ${nrf52840_base.build_flags}
   -I variants/nrf52840/rak4631_eth_gw
   -D RAK_4631
diff --git a/variants/nrf52840/rak4631_nomadstar_meteor_pro/platformio.ini b/variants/nrf52840/rak4631_nomadstar_meteor_pro/platformio.ini
index e3c2fb018..5ee9e29de 100644
--- a/variants/nrf52840/rak4631_nomadstar_meteor_pro/platformio.ini
+++ b/variants/nrf52840/rak4631_nomadstar_meteor_pro/platformio.ini
@@ -12,7 +12,6 @@ custom_meshtastic_tags = NomadStar
 extends = nrf52840_base
 board_level = release
 board = wiscore_rak4631
-board_check = true
 build_flags = ${nrf52840_base.build_flags}
   -I variants/nrf52840/rak4631_nomadstar_meteor_pro
   -D NOMADSTAR_METEOR_PRO
diff --git a/variants/nrf52840/rak_wismeshtag/platformio.ini b/variants/nrf52840/rak_wismeshtag/platformio.ini
index d8c289d14..0276b1e12 100644
--- a/variants/nrf52840/rak_wismeshtag/platformio.ini
+++ b/variants/nrf52840/rak_wismeshtag/platformio.ini
@@ -7,7 +7,6 @@ custom_meshtastic_tags = RAK
 extends = nrf52840_base
 board_level = release
 board = wiscore_rak4631
-board_check = true
 custom_meshtastic_hw_model = 105
 custom_meshtastic_hw_model_slug = WISMESH_TAG
 custom_meshtastic_architecture = nrf52840
diff --git a/variants/nrf52840/t-echo-lite/platformio.ini b/variants/nrf52840/t-echo-lite/platformio.ini
index d0e392a9f..b94231780 100644
--- a/variants/nrf52840/t-echo-lite/platformio.ini
+++ b/variants/nrf52840/t-echo-lite/platformio.ini
@@ -12,7 +12,6 @@ custom_meshtastic_tags = LilyGo
 extends = nrf52840_base
 board_level = release
 board = t-echo
-board_check = true
 debug_tool = jlink
 
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
diff --git a/variants/nrf52840/t-echo-plus/platformio.ini b/variants/nrf52840/t-echo-plus/platformio.ini
index 313eceadc..8a567061f 100644
--- a/variants/nrf52840/t-echo-plus/platformio.ini
+++ b/variants/nrf52840/t-echo-plus/platformio.ini
@@ -13,7 +13,6 @@ custom_meshtastic_has_ink_hud = true
 extends = nrf52840_base
 board = t-echo
 board_level = pr
-board_check = true
 debug_tool = jlink
 
 build_flags = ${nrf52840_base.build_flags}
diff --git a/variants/nrf52840/t-echo/platformio.ini b/variants/nrf52840/t-echo/platformio.ini
index 3ce0932b3..fe166ccf7 100644
--- a/variants/nrf52840/t-echo/platformio.ini
+++ b/variants/nrf52840/t-echo/platformio.ini
@@ -13,7 +13,6 @@ custom_meshtastic_has_ink_hud = true
 extends = nrf52840_base
 board_level = release
 board = t-echo
-board_check = true
 debug_tool = jlink
 
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
@@ -40,7 +39,6 @@ lib_deps =
 extends = nrf52840_base, inkhud
 board_level = release
 board = t-echo
-board_check = true
 debug_tool = jlink
 build_flags = 
   ${nrf52840_base.build_flags}
diff --git a/variants/rp2040/rpipicow/platformio.ini b/variants/rp2040/rpipicow/platformio.ini
index 99e02a1aa..8d4b07193 100644
--- a/variants/rp2040/rpipicow/platformio.ini
+++ b/variants/rp2040/rpipicow/platformio.ini
@@ -12,7 +12,6 @@ custom_meshtastic_requires_dfu = true
 extends = rp2040_base
 board = rpipicow
 board_level = pr
-board_check = true
 upload_protocol = picotool
 # add our variants files to the include and src paths
 build_flags = 
diff --git a/variants/rp2350/rpipico2w/platformio.ini b/variants/rp2350/rpipico2w/platformio.ini
index da408b67d..c32a8ca0f 100644
--- a/variants/rp2350/rpipico2w/platformio.ini
+++ b/variants/rp2350/rpipico2w/platformio.ini
@@ -2,7 +2,6 @@
 extends = rp2350_base
 board = rpipico2w
 board_level = pr
-board_check = true
 upload_protocol = jlink
 # debug settings for external openocd with RP2040 support (custom build)
 debug_tool = custom