diff --git a/Kconfig b/Kconfig
index 02a9380814..0e5d247d7d 100644
--- a/Kconfig
+++ b/Kconfig
@@ -34,6 +34,19 @@ mainmenu "Espressif IoT Development Framework Configuration"
         bool
         default "y" if IDF_TARGET="esp32s3"
 
+    choice IDF_TARGET_ESP32S3_BETA_VERSION
+        prompt "ESP32-S3 beta version"
+        depends on IDF_TARGET_ESP32S3
+        default IDF_TARGET_ESP32S3_BETA_VERSION_2
+        help
+            Currently ESP32-S3 has several beta versions for internal use only.
+            Select the one that matches your chip model.
+
+        config IDF_TARGET_ESP32S3_BETA_VERSION_2
+            bool
+            prompt "ESP32-S3 beta2"
+    endchoice
+
     config IDF_FIRMWARE_CHIP_ID
         hex
         default 0x0000 if IDF_TARGET_ESP32
diff --git a/components/esptool_py/Kconfig.projbuild b/components/esptool_py/Kconfig.projbuild
index 16eca6e003..3069be8a69 100644
--- a/components/esptool_py/Kconfig.projbuild
+++ b/components/esptool_py/Kconfig.projbuild
@@ -57,7 +57,7 @@ menu "Serial flasher config"
     config ESPTOOLPY_WITH_STUB
         # Only real reason to disable this is when ESP32-S2 Secure Download Mode is set
         bool
-        default "y" if !IDF_TARGET_ESP32S3
+        default "y"
         depends on !SECURE_ENABLE_SECURE_ROM_DL_MODE
 
     choice ESPTOOLPY_FLASHMODE
diff --git a/components/esptool_py/esptool b/components/esptool_py/esptool
index 09549c0311..0f064e1d6c 160000
--- a/components/esptool_py/esptool
+++ b/components/esptool_py/esptool
@@ -1 +1 @@
-Subproject commit 09549c03111a2b330371d361d56227a457af66c5
+Subproject commit 0f064e1d6c5640785a602de564b21040dcc32926
diff --git a/components/esptool_py/project_include.cmake b/components/esptool_py/project_include.cmake
index c421458474..db56a9cd19 100644
--- a/components/esptool_py/project_include.cmake
+++ b/components/esptool_py/project_include.cmake
@@ -4,7 +4,14 @@
 idf_build_get_property(target IDF_TARGET)
 idf_build_get_property(python PYTHON)
 
-set(ESPTOOLPY ${python} "${CMAKE_CURRENT_LIST_DIR}/esptool/esptool.py" --chip ${target})
+set(chip_model ${target})
+if(target STREQUAL "esp32s3")
+    if(CONFIG_IDF_TARGET_ESP32S3_BETA_VERSION_2)
+        set(chip_model "esp32s3beta2")
+    endif()
+endif()
+
+set(ESPTOOLPY ${python} "${CMAKE_CURRENT_LIST_DIR}/esptool/esptool.py" --chip ${chip_model})
 set(ESPSECUREPY ${python} "${CMAKE_CURRENT_LIST_DIR}/esptool/espsecure.py")
 set(ESPEFUSEPY ${python} "${CMAKE_CURRENT_LIST_DIR}/esptool/espefuse.py")