diff --git a/docker/Dockerfile b/docker/Dockerfile
index ee375ba690..117ec17ae4 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -55,7 +55,7 @@ RUN \
     pip3 install \
     --break-system-packages --no-cache-dir \
     # Keep platformio version in sync with requirements.txt
-    platformio==6.1.16 \
+    platformio==6.1.18 \
     # Change some platformio settings
     && platformio settings set enable_telemetry No \
     && platformio settings set check_platformio_interval 1000000 \
diff --git a/requirements.txt b/requirements.txt
index fa0e00d0d4..ef1542ffe9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ tornado==6.4.2
 tzlocal==5.3.1    # from time
 tzdata>=2021.1  # from time
 pyserial==3.5
-platformio==6.1.18  # When updating platformio, also update Dockerfile
+platformio==6.1.18  # When updating platformio, also update /docker/Dockerfile
 esptool==4.8.1
 click==8.1.7
 esphome-dashboard==20250212.0