diff --git a/.clang-tidy.hash b/.clang-tidy.hash
index 72a99675909..ba22a61ede8 100644
--- a/.clang-tidy.hash
+++ b/.clang-tidy.hash
@@ -1 +1 @@
-075ed2142432dc59883bb52db8ac11270f952851d6400deae080f5468c7cb592
+b92adf594cf596ec5dd5858406c479ac258eb33f2a7517522ed89d4594a68f56
diff --git a/platformio.ini b/platformio.ini
index e2c7e2b097d..2bb5f40d097 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -105,6 +105,11 @@ extends = common:arduino
 platform = platformio/espressif8266@4.2.1
 platform_packages =
     platformio/framework-arduinoespressif8266@~3.30102.0
+    ; Override the ancient tool-esptoolpy ~1.30000.0 pinned by
+    ; platform-espressif8266 4.2.1 with the same 5.x build the pioarduino
+    ; ESP32 platform uses, so switching between esp8266 and esp32 builds
+    ; does not reinstall tool-esptoolpy every time.
+    pioarduino/tool-esptoolpy@https://github.com/pioarduino/registry/releases/download/0.0.1/esptoolpy-v5.2.0.zip
 
 framework = arduino
 lib_deps =