diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py
index a01816c..edc2e90 100644
--- a/builder/frameworks/espidf.py
+++ b/builder/frameworks/espidf.py
@@ -304,10 +304,9 @@ env.Append(
         "-T", "esp32.rom.spiram_incompatible_fns.ld"
     ],
 
-    EXTRA_ESPTOOL_UPLOADFLAGS=[
-        "0x1000", join("$BUILD_DIR", "bootloader.bin"),
-        "0x8000", join("$BUILD_DIR", "partitions_table.bin"),
-        "0x10000"
+    FLASH_EXTRA_IMAGES=[
+        ("0x1000", join("$BUILD_DIR", "bootloader.bin")),
+        ("0x8000", join("$BUILD_DIR", "partitions_table.bin"))
     ]
 )
 
diff --git a/builder/main.py b/builder/main.py
index d6f1ed5..e3f6c4e 100644
--- a/builder/main.py
+++ b/builder/main.py
@@ -236,7 +236,7 @@ if upload_protocol == "esptool":
             "$UPLOAD_FLAGS"
         ],
 
-        UPLOADCMD='"$PYTHONEXE" "$UPLOADER" $UPLOADERFLAGS $EXTRA_ESPTOOL_UPLOADFLAGS $SOURCE',
+        UPLOADCMD='"$PYTHONEXE" "$UPLOADER" $UPLOADERFLAGS $FLASH_EXTRA_IMAGES 0x10000 $SOURCE',
         UPLOADOTACMD='"$PYTHONEXE" "$UPLOADEROTA" $UPLOADEROTAFLAGS -f $SOURCE',
     )