diff --git a/.github/workflows/ArduinoBuild.yml b/.github/workflows/ArduinoBuild.yml
index dd9e34f..b44a54b 100644
--- a/.github/workflows/ArduinoBuild.yml
+++ b/.github/workflows/ArduinoBuild.yml
@@ -26,58 +26,55 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # ===================
-          # Espressif Board Manager
-          # ===================
-          # ESP32
+          # Versions are split with the M5Unified / M5GFX CI so that the two together cover every
+          # arduino-esp32 series from 2.0 to 3.3 without building the same one twice.
+          # Minimums: C6 / H2 3.0, P4 3.1, C5 3.3.
+          # Espressif Board Manager: 3.0.7
           - board: esp32:esp32:esp32
-            esp32_version: 2.0.17
-            board_manager_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
-          - board: esp32:esp32:esp32
-            esp32_version: 3.1.1
-            board_manager_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
-          # ESP32-S3
-          - board: esp32:esp32:esp32s3
-            esp32_version: 2.0.17
+            esp32_version: 3.0.7
             board_manager_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
           - board: esp32:esp32:esp32s3
-            esp32_version: 3.1.1
+            esp32_version: 3.0.7
             board_manager_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
-          # ESP32-C3
           - board: esp32:esp32:esp32c3
-            esp32_version: 2.0.17
+            esp32_version: 3.0.7
             board_manager_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
-          - board: esp32:esp32:esp32c3
-            esp32_version: 3.1.1
+          - board: esp32:esp32:esp32c6
+            esp32_version: 3.0.7
             board_manager_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
-          # ESP32-C5 (v3.3+ only)
-          - board: esp32:esp32:esp32c5
-            esp32_version: 3.3.11
+          - board: esp32:esp32:esp32h2
+            esp32_version: 3.0.7
+            board_manager_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
+          # Espressif Board Manager: 3.2.1
+          - board: esp32:esp32:esp32
+            esp32_version: 3.2.1
+            board_manager_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
+          - board: esp32:esp32:esp32s3
+            esp32_version: 3.2.1
             board_manager_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
-
-          # ESP32-C6 (v3 only)
           - board: esp32:esp32:esp32c6
-            esp32_version: 3.1.1
+            esp32_version: 3.2.1
             board_manager_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
-          # ESP32-P4 (v3 only)
           - board: esp32:esp32:esp32p4
-            esp32_version: 3.1.1
+            esp32_version: 3.2.1
             board_manager_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
-          # ESP32-H2 (v3 only)
-          - board: esp32:esp32:esp32h2
-            esp32_version: 3.1.1
+          # Espressif Board Manager: 3.3.12 (latest)
+          - board: esp32:esp32:esp32
+            esp32_version: 3.3.12
+            board_manager_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
+          - board: esp32:esp32:esp32s3
+            esp32_version: 3.3.12
+            board_manager_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
+          - board: esp32:esp32:esp32c5
+            esp32_version: 3.3.12
+            board_manager_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
+          - board: esp32:esp32:esp32p4
+            esp32_version: 3.3.12
             board_manager_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
-          # ===================
           # M5Stack Board Manager
-          # ===================
-          # M5Core (ESP32)
-          - board: m5stack:esp32:m5stack_core
-            esp32_version: 2.1.4
-            board_manager_url: https://static-cdn.m5stack.com/resource/arduino/package_m5stack_index.json
           - board: m5stack:esp32:m5stack_core
             esp32_version: 3.2.5
             board_manager_url: https://static-cdn.m5stack.com/resource/arduino/package_m5stack_index.json
-          # M5CoreS3 (ESP32-S3, v3 only)
           - board: m5stack:esp32:m5stack_cores3
             esp32_version: 3.2.5
             board_manager_url: https://static-cdn.m5stack.com/resource/arduino/package_m5stack_index.json
diff --git a/.github/workflows/IDFBuild.yml b/.github/workflows/IDFBuild.yml
index a5b6679..f8d3194 100644
--- a/.github/workflows/IDFBuild.yml
+++ b/.github/workflows/IDFBuild.yml
@@ -28,42 +28,45 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          # Versions are split with the M5Unified / M5GFX CI so that the two together cover every IDF
+          # minor from 5.1 to 6.1 without building the same one twice. Keep each chip at or above its
+          # minimum version.
           # ESP32
           - target: esp32
-            idf_version: "5.3"
+            idf_version: "5.2.6"
           - target: esp32
-            idf_version: "5.1.6"
+            idf_version: "5.3"
           - target: esp32
-            idf_version: "6.0.2"
+            idf_version: "6.1"
           # ESP32-S3
           - target: esp32s3
-            idf_version: "5.3"
+            idf_version: "5.2.6"
           - target: esp32s3
-            idf_version: "5.1.6"
+            idf_version: "5.3"
           - target: esp32s3
-            idf_version: "6.0.2"
+            idf_version: "6.1"
           # ESP32-C3
           - target: esp32c3
-            idf_version: "5.3"
-          - target: esp32c3
-            idf_version: "5.1.6"
+            idf_version: "5.2.6"
           # ESP32-C5 (IDF 5.5+ only)
           - target: esp32c5
-            idf_version: "5.5.2"
+            idf_version: "6.1"
           # ESP32-C6 (IDF 5.3+ only)
           - target: esp32c6
             idf_version: "5.3"
-          # ESP32-C61 (IDF 5.5.2+ only)
-          - target: esp32c61
-            idf_version: "5.5.2"
+          - target: esp32c6
+            idf_version: "6.1"
           # ESP32-H2
           - target: esp32h2
-            idf_version: "5.3"
-          - target: esp32h2
-            idf_version: "5.1.6"
+            idf_version: "5.2.6"
           # ESP32-P4 (IDF 5.3+ only)
           - target: esp32p4
             idf_version: "5.3"
+          - target: esp32p4
+            idf_version: "6.1"
+          # ESP32-C61 (IDF 5.5.2+ only)
+          - target: esp32c61
+            idf_version: "6.1"
 
     steps:
       - name: Checkout