diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ceecfec..6250101 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Merge single .bin for M5Burner
         run: |
           esptool.py --chip esp32s3 merge-bin \
-            --flash-mode qio --flash-size 16MB \
+            --flash-mode dio --flash-size 16MB \
             -o ratdeck-merged.bin \
             0x0000 .pio/build/ratdeck_915/bootloader.bin \
             0x8000 .pio/build/ratdeck_915/partitions.bin \
@@ -48,7 +48,7 @@ jobs:
           {
             "chipFamily": "ESP32-S3",
             "flashSize": "16MB",
-            "flashMode": "qio",
+            "flashMode": "dio",
             "flashFreq": "80m",
             "parts": [
               { "path": "bootloader.bin", "offset": "0x0000" },
@@ -115,7 +115,7 @@ jobs:
       - name: Merge single .bin for M5Burner
         run: |
           esptool.py --chip esp32s3 merge-bin \
-            --flash-mode qio --flash-size 16MB \
+            --flash-mode dio --flash-size 16MB \
             -o ratdeck-merged.bin \
             0x0000 .pio/build/ratdeck_915/bootloader.bin \
             0x8000 .pio/build/ratdeck_915/partitions.bin \
@@ -133,7 +133,7 @@ jobs:
           {
             "chipFamily": "ESP32-S3",
             "flashSize": "16MB",
-            "flashMode": "qio",
+            "flashMode": "dio",
             "flashFreq": "80m",
             "parts": [
               { "path": "bootloader.bin", "offset": "0x0000" },
diff --git a/Makefile b/Makefile
index 1ef1bf0..50cb139 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,7 @@ standalone-image: build-standalone
 rnode-only-image: build-rnode
 	mkdir -p $(BUILD_DIR)
 	python3 -m esptool --chip esp32s3 merge-bin \
-		--flash-mode qio --flash-size 16MB \
+		--flash-mode dio --flash-size 16MB \
 		--output $(RNODE_ONLY_BIN) \
 		0x0000 $(RNODE_BOOTLOADER_BIN) \
 		0x8000 $(RNODE_PARTITIONS_BIN) \
diff --git a/launcher/platformio.ini b/launcher/platformio.ini
index cf69d0c..3859318 100644
--- a/launcher/platformio.ini
+++ b/launcher/platformio.ini
@@ -4,7 +4,7 @@ board = esp32-s3-devkitc-1
 framework = arduino
 
 board_build.flash_size = 16MB
-board_build.flash_mode = qio
+board_build.flash_mode = dio
 board_build.partitions = ../partitions/rsdeck_16mb_dual.csv
 board_upload.flash_size = 16MB
 
@@ -13,6 +13,7 @@ build_flags =
     -DARDUINO_USB_CDC_ON_BOOT=1
     -DARDUINO_USB_MODE=1
     -I../src/platform
+    -I../src
 
 build_unflags =
     -std=gnu++11
diff --git a/merge_firmware.py b/merge_firmware.py
index 397feb4..07d54f8 100644
--- a/merge_firmware.py
+++ b/merge_firmware.py
@@ -20,7 +20,7 @@ def merge_bin(source, target, env):
     python = env.subst("$PYTHONEXE")
     env.Execute(
         f"{shlex.quote(python)} -m esptool --chip esp32s3 merge-bin "
-        "--flash-mode qio --flash-size 16MB "
+        "--flash-mode dio --flash-size 16MB "
         f"-o {shlex.quote(output)} "
         f"0x0000 {shlex.quote(os.path.join(build_dir, 'bootloader.bin'))} "
         f"0x8000 {shlex.quote(os.path.join(build_dir, 'partitions.bin'))} "
diff --git a/tools/make_dual_image.py b/tools/make_dual_image.py
index c23677f..ad77220 100644
--- a/tools/make_dual_image.py
+++ b/tools/make_dual_image.py
@@ -68,7 +68,7 @@ def main() -> int:
         "esp32s3",
         "merge-bin",
         "--flash-mode",
-        "qio",
+        "dio",
         "--flash-size",
         "16MB",
         "--output",
diff --git a/tools/package_merged_zip.py b/tools/package_merged_zip.py
index ee8cac9..03f46c3 100644
--- a/tools/package_merged_zip.py
+++ b/tools/package_merged_zip.py
@@ -23,7 +23,7 @@ def main() -> int:
     manifest = {
         "chipFamily": "ESP32-S3",
         "flashSize": "16MB",
-        "flashMode": "qio",
+        "flashMode": "dio",
         "flashFreq": "80m",
         "parts": [
             {"path": image_name, "offset": "0x0000"},
diff --git a/vendor/rnode_firmware/Makefile b/vendor/rnode_firmware/Makefile
index 4447f6c..40c3067 100644
--- a/vendor/rnode_firmware/Makefile
+++ b/vendor/rnode_firmware/Makefile
@@ -35,7 +35,7 @@ CARDPUTER_ADV_EXTRA_FLAGS = \"-DBOARD_MODEL=0x43\" \"-DCARDPUTER_ADV_DEFAULT_FRE
 
 # T-Deck (Plus) dual-boot build — same staging pattern as the Cardputer Adv.
 # Defaults reuse the CARDPUTER_ADV_DEFAULT_* fallbacks in Utilities.h.
-TDECK_FQBN = esp32:esp32:esp32s3:CDCOnBoot=cdc,USBMode=hwcdc,FlashSize=16M,FlashMode=qio,PartitionScheme=no_ota
+TDECK_FQBN = esp32:esp32:esp32s3:CDCOnBoot=cdc,USBMode=hwcdc,FlashSize=16M,FlashMode=dio,PartitionScheme=no_ota
 TDECK_SKETCH = build/tdeck_sketch/RNode_Firmware
 TDECK_BUILD = build/tdeck_build
 TDECK_OUTPUT = build/tdeck.esp32.esp32s3