diff --git a/.github/workflows/BuildLibrary.yml b/.github/workflows/BuildLibrary.yml
index 011a53b..93be80d 100644
--- a/.github/workflows/BuildLibrary.yml
+++ b/.github/workflows/BuildLibrary.yml
@@ -29,12 +29,14 @@ jobs:
         #############################################################################################################
         arduino-boards-fqbn:
           - arduino:avr:uno
+          - arduino:avr:uno|All-US_915
           - arduino:avr:leonardo
           - arduino:samd:nano_33_iot
           - arduino:mbed:nano33ble
           - esp8266:esp8266:huzzah:eesz=4M3M,xtal=80
           - rp2040:rp2040:generic
           - esp32:esp32:featheresp32:FlashFreq=80
+          - esp32:esp32:featheresp32:FlashFreq=80
 
         # Specify parameters for each board.
         # Parameters can be: platform-url, examples-exclude and examples-build-properties
@@ -51,92 +53,19 @@ jobs:
                 -DDEBUG 
                 -DUS_915 
                 -_CLASS_C_
-              All:
-                -DDEBUG
-                -DUS_915
+          - arduino-boards-fqbn: arduino:avr:uno|All-US_915
+            build-properties: 
+                  All:
+                    -DDEBUG
           - arduino-boards-fqbn: arduino:avr:leonardo
-            build-properties:  
-              class-C-ABP": 
-                -DDEBUG 
-                -DUS_915 
-                -_CLASS_C_
-              Class-C-OTAA-ACK": 
-                -DDEBUG 
-                -DUS_915 
-                -_CLASS_C_
-              All:
-                -DDEBUG
-                -DUS_915
-                -DUS_915
           - arduino-boards-fqbn: arduino:samd:nano_33_iot
-            build-properties:  
-              class-C-ABP": 
-                -DDEBUG 
-                -DUS_915 
-                -_CLASS_C_
-              Class-C-OTAA-ACK": 
-                -DDEBUG 
-                -DUS_915 
-                -_CLASS_C_
-              All:
-                -DDEBUG
-                -DUS_915
-
           - arduino-boards-fqbn: arduino:mbed:nano33ble
-            build-properties:  
-              class-C-ABP": 
-                -DDEBUG 
-                -DUS_915 
-                -_CLASS_C_
-              Class-C-OTAA-ACK": 
-                -DDEBUG 
-                -DUS_915 
-                -_CLASS_C_
-              All:
-                -DDEBUG
-                -DUS_915
           - arduino-boards-fqbn: esp8266:esp8266:huzzah:eesz=4M3M,xtal=80
             platform-url: https://arduino.esp8266.com/stable/package_esp8266com_index.json
-            build-properties:  
-              class-C-ABP": 
-                -DDEBUG 
-                -DUS_915 
-                -_CLASS_C_
-              Class-C-OTAA-ACK": 
-                -DDEBUG 
-                -DUS_915 
-                -_CLASS_C_
-              All:
-                -DDEBUG
-                -DUS_915
           - arduino-boards-fqbn: rp2040:rp2040:generic
             platform-url: https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json
-            build-properties:  
-              class-C-ABP": 
-                -DDEBUG 
-                -DUS_915 
-                -_CLASS_C_
-              Class-C-OTAA-ACK": 
-                -DDEBUG 
-                -DUS_915 
-                -_CLASS_C_
-              All:
-                -DDEBUG
-                -DUS_915
           - arduino-boards-fqbn: esp32:esp32:featheresp32:FlashFreq=80
             platform-url: https://github.com/espressif/arduino-esp32/releases/download/3.0.0-alpha2/package_esp32_dev_index.json
-            build-properties:  
-              class-C-ABP": 
-                -DDEBUG 
-                -DUS_915 
-                -_CLASS_C_
-              Class-C-OTAA-ACK": 
-                -DDEBUG 
-                -DUS_915 
-                -_CLASS_C_
-              All:
-                -DDEBUG
-                -DUS_915
             extra-arduino-cli-args: "--warnings default"
 
       # Do not cancel all jobs / architectures if one job fails