diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml
index 1afce174e..91b0be09b 100644
--- a/.github/workflows/build-clang-doxy.yml
+++ b/.github/workflows/build-clang-doxy.yml
@@ -245,6 +245,7 @@ jobs:
             "itsybitsy_esp32",
             "wippersnapper_qtpy_esp32c3",
             "wippersnapper_feather_esp32c6",
+            "wippersnapper_feather_esp32c6_debug"
           ]
         include:
           - offset: "0x1000"
@@ -252,6 +253,8 @@ jobs:
             arduino-platform: "wippersnapper_qtpy_esp32c3"
           - offset: "0x0"
             arduino-platform: "wippersnapper_feather_esp32c6"
+          - offset: "0x0"
+            arduino-platform: "wippersnapper_feather_esp32c6_debug"
     steps:
       - uses: actions/setup-python@v5
         with:
@@ -264,8 +267,8 @@ jobs:
           echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags)
       - uses: actions/checkout@v4
         with:
-          repository: tyeth/ci-arduino
-          ref: WS_ARDUINO_598-preprocessor-script-for-printing-the-library-versions-to-boot_outtxt
+          repository: brentru/ci-arduino
+          ref: debug-c6
           path: ci
       - name: Checkout Board Definitions
         uses: actions/checkout@v4
@@ -290,7 +293,7 @@ jobs:
         run: |
           pip3 install esptool
       - name: build ESP32 platforms
-        run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 --include_print_dependencies_header ./src/print_dependencies.h
+        run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000
       - name: Check artifacts
         run: |
           ls examples/Wippersnapper_demo/build/*
@@ -326,16 +329,20 @@ jobs:
             echo $content
             echo EOF
           } >> "$GITHUB_OUTPUT"
+      - name: Print matrix offset
+        run: |
+          echo "Matrix offset: ${{ matrix.offset }}"
       - name: Create combined binary using Esptool merge_bin
         run: |
           echo ${{ steps.get_board_json.outputs.boardJson }}
           echo ${{ fromJson(steps.get_board_json.outputs.boardJson) }}
           python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge_bin \
-            --flash_mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \
-            --flash_freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \
-            --flash_size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \
+            --flash_mode keep \
+            --flash_freq keep \
+            --flash_size keep \
+            --fill-flash-size 4MB \
             -o wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.combined.bin \
-            ${{ matrix.offset }} wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin \
+            0x0 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin \
             0x8000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin \
             0xe000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.boot_app0.bin \
             0x10000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bin