diff --git a/pio-tools/metrics-firmware.py b/pio-tools/metrics-firmware.py
index 38849ea60..550a72b35 100644
--- a/pio-tools/metrics-firmware.py
+++ b/pio-tools/metrics-firmware.py
@@ -1,22 +1,11 @@
 Import("env")
 
 import os
-import tasmotapiolib
 from os.path import join
-import subprocess
 
 def firm_metrics(source, target, env):
     print()
-    if env["PIOPLATFORM"] == "espressif32":
-        try:
-            import tasmota_metrics
-            map_file = str(tasmotapiolib.get_source_map_path(env).resolve())
-            subprocess.run([
-                env.subst("$PYTHONEXE"), "-m", "tasmota_metrics", map_file
-            ], check=False)
-        except:
-            pass
-    elif env["PIOPLATFORM"] == "espressif8266":
+    if env["PIOPLATFORM"] == "espressif8266":
         map_file = join(env.subst("$BUILD_DIR")) + os.sep + "firmware.map"
         with open(map_file,'r', encoding='utf-8') as f:
             phrase = "_text_end = ABSOLUTE (.)"
diff --git a/pio-tools/post_esp32.py b/pio-tools/post_esp32.py
index 6992f45b0..27ea91b5c 100644
--- a/pio-tools/post_esp32.py
+++ b/pio-tools/post_esp32.py
@@ -38,7 +38,6 @@ from platformio.project.config import ProjectConfig
 
 esptoolpy = os.path.join(ProjectConfig.get_instance().get("platformio", "packages_dir"), "tool-esptoolpy")
 sys.path.append(esptoolpy)
-
 import esptool
 
 config = env.GetProjectConfig()
@@ -103,8 +102,8 @@ def esp32_detect_flashsize():
     if not "esptool" in uploader:
         return "4MB",False
     else:
-        esptoolpy_flags = ["flash_id"]
-        esptoolpy_cmd = [env["PYTHONEXE"], esptoolpy] + esptoolpy_flags
+        esptoolpy_flags = ["flash-id"]
+        esptoolpy_cmd = esptoolpy + esptoolpy_flags
         try:
             output = subprocess.run(esptoolpy_cmd, capture_output=True).stdout.splitlines()
             for l in output:
@@ -282,14 +281,14 @@ def esp32_create_combined_bin(source, target, env):
         cmd = [
             "--chip",
             chip,
-            "merge_bin",
+            "merge-bin",
             "-o",
             new_file_name,
-            "--flash_mode",
+            "--flash-mode",
             flash_mode,
-            "--flash_freq",
+            "--flash-freq",
             flash_freq,
-            "--flash_size",
+            "--flash-size",
             flash_size,
         ]
         # platformio estimates the flash space used to store the firmware.
@@ -320,8 +319,8 @@ def esp32_create_combined_bin(source, target, env):
         if(upload_protocol == "esptool") and (fs_offset != -1):
             fs_bin = join(env.subst("$BUILD_DIR"),"littlefs.bin")
             if exists(fs_bin):
-                before_reset = env.BoardConfig().get("upload.before_reset", "default_reset")
-                after_reset = env.BoardConfig().get("upload.after_reset", "hard_reset")
+                before_reset = env.BoardConfig().get("upload.before_reset", "default-reset")
+                after_reset = env.BoardConfig().get("upload.after_reset", "hard-reset")
                 print(f" -  {hex(fs_offset).ljust(8)} | {fs_bin}")
                 print()
                 cmd += [hex(fs_offset), fs_bin]
@@ -332,12 +331,12 @@ def esp32_create_combined_bin(source, target, env):
                 "--baud", "$UPLOAD_SPEED",
                 "--before", before_reset,
                 "--after", after_reset,
-                "write_flash", "-z",
-                "--flash_mode", "${__get_board_flash_mode(__env__)}",
-                "--flash_freq", "${__get_board_f_flash(__env__)}",
-                "--flash_size", flash_size
+                "write-flash", "-z",
+                "--flash-mode", "${__get_board_flash_mode(__env__)}",
+                "--flash-freq", "${__get_board_f_flash(__env__)}",
+                "--flash-size", flash_size
                 ],
-                UPLOADCMD='"$PYTHONEXE" "$UPLOADER" $UPLOADERFLAGS ' + " ".join(cmd[7:])
+                UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS ' + " ".join(cmd[7:])
                 )
                 print(Fore.GREEN + "Will use custom upload command for flashing operation to add file system defined for this build target.")
                 print()