diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index 2d1e6d6f5c..461a27acad 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -25,7 +25,7 @@ all:
 clean:
 	$(RM) -rf $(BUILD)
 
-GIT_SUBMODULES += lib/pico-sdk lib/tinyusb
+GIT_SUBMODULES += lib/mbedtls lib/pico-sdk lib/tinyusb
 
 submodules:
 	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="$(GIT_SUBMODULES)" submodules
diff --git a/tools/ci.sh b/tools/ci.sh
index 98c95465c0..bf60d788a5 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -256,7 +256,7 @@ function ci_rp2_setup {
 
 function ci_rp2_build {
     make ${MAKEOPTS} -C mpy-cross
-    git submodule update --init lib/mbedtls lib/pico-sdk lib/tinyusb
+    make ${MAKEOPTS} -C ports/rp2 submodules
     make ${MAKEOPTS} -C ports/rp2
     make ${MAKEOPTS} -C ports/rp2 clean
     make ${MAKEOPTS} -C ports/rp2 USER_C_MODULES=../../examples/usercmodule/micropython.cmake