diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d65439b14..a34aa37207 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,7 +45,7 @@ variables:
   CI_TARGET_TEST_CONFIG_FILE: "$CI_PROJECT_DIR/tools/ci/config/target-test.yml"
 
   # Versioned esp-idf-doc env image to use for all document building jobs
-  ESP_IDF_DOC_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-idf-doc-env:v5"
+  ESP_IDF_DOC_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-idf-doc-env:v7"
 
 
 # before each job, we need to check if this job is filtered by bot stage/job filter
diff --git a/components/esptool_py/esptool b/components/esptool_py/esptool
index 456384ca33..4fa0bd7b0d 160000
--- a/components/esptool_py/esptool
+++ b/components/esptool_py/esptool
@@ -1 +1 @@
-Subproject commit 456384ca330f7bee6510d1690f89465845d705e8
+Subproject commit 4fa0bd7b0d1f69f5ff22b043adc07c5e562a8931
diff --git a/requirements.txt b/requirements.txt
index c410758a2c..76e9c6b549 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,8 +16,11 @@ gdbgui==0.13.2.0
 # Windows is not supported since 0.14.0.0. See https://github.com/cs01/gdbgui/issues/348
 pygdbmi<=0.9.0.2
 # The pygdbmi required max version 0.9.0.2 since 0.9.0.3 is not copatible with latest gdbgui (>=0.13.2.0)
-reedsolo==1.5.3
+
+# esptool requirements (see components/esptool_py/esptool/setup.py)
+reedsolo>=1.5.3,<=1.5.4
 bitstring>=3.1.6
+ecdsa>=0.16.0
 
 # windows-curses are required in Windows command line but cannot be installed in MSYS2. A requirement like
 # "windows-curses; sys_platform == 'win32'" would want to install the package on both of them. There is no environment