diff --git a/builder/main.py b/builder/main.py
index e3f6c4e..b9c06c6 100644
--- a/builder/main.py
+++ b/builder/main.py
@@ -278,12 +278,16 @@ elif upload_protocol in debug_tools:
     uploader_flags.extend(debug_tools.get(upload_protocol).get(
         "server").get("arguments", []))
     uploader_flags.extend([
-        "-c",
-        "program_esp32 {{$SOURCE}} 0x10000 verify reset; shutdown;"
+        "-c", "program_esp32 {{$SOURCE}} 0x10000 verify"
     ])
+    for image in env.get("FLASH_EXTRA_IMAGES", []):
+        uploader_flags.extend([
+            "-c", "program_esp32 %s %s verify" % (image[1], image[0])
+        ])
+    uploader_flags.extend(["-c", "reset run; shutdown"])
     for i, item in enumerate(uploader_flags):
         if "$PACKAGE_DIR" in item:
-            uploader_flags[i] = item.replace("$PACKAGE_DIR",openocd_dir)
+            uploader_flags[i] = item.replace("$PACKAGE_DIR", openocd_dir)
 
     env.Replace(
         UPLOADER="openocd",