diff --git a/.gitmodules b/.gitmodules
index 0edcdec653..cf0d86f3ab 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -145,8 +145,8 @@
 	url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
 [submodule "ports/espressif/esp-idf"]
 	path = ports/espressif/esp-idf
-	url = https://github.com/espressif/esp-idf.git
-	branch = release/v4.4
+	url = https://github.com/adafruit/esp-idf.git
+	branch = circuitpython8
 [submodule "ports/espressif/certificates/nina-fw"]
 	path = ports/espressif/certificates/nina-fw
 	url = https://github.com/adafruit/nina-fw.git
diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf
index 944c01eef4..171e5af9c5 160000
--- a/ports/espressif/esp-idf
+++ b/ports/espressif/esp-idf
@@ -1 +1 @@
-Subproject commit 944c01eef4fbba693f991f9d033cda3f59ca82c9
+Subproject commit 171e5af9c5b9b126c5f81f217c7b1ff931d54863