diff --git a/lib/mpy-test-ext b/lib/mpy-test-ext
index a68c7f43dd94d..14d01cc3fd814 160000
--- a/lib/mpy-test-ext
+++ b/lib/mpy-test-ext
@@ -1 +1 @@
-Subproject commit a68c7f43dd94d4865564c44256f88e515217ef09
+Subproject commit 14d01cc3fd8142d2432d18be85f6c9854138425c
diff --git a/ports/psoc6/Makefile b/ports/psoc6/Makefile
index 9d535e95dabbd..4cdaafb0af51a 100644
--- a/ports/psoc6/Makefile
+++ b/ports/psoc6/Makefile
@@ -223,7 +223,7 @@ endif
 
 attached_devs:
 	@:
-	$(eval ATTACHED_TARGET_LIST = $(shell $(PYTHON) $(TOP)/lib/mpy-test-ext/devs_query.py serial_number $(MULTI_BOARD_DEVS_OPTS)))
+	$(eval ATTACHED_TARGET_LIST = $(shell etdevs-query serial_number $(MULTI_BOARD_DEVS_OPTS)))
 	$(eval ATTACHED_TARGETS_NUMBER = $(words $(ATTACHED_TARGET_LIST)))
 	$(info Number of attached targets : $(ATTACHED_TARGETS_NUMBER))
 	$(info List of attached targets : $(ATTACHED_TARGET_LIST))
diff --git a/tools/ci.sh b/tools/ci.sh
index 1df1b0c0aa6cf..c73adca6b0bb7 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -389,7 +389,8 @@ function ci_psoc6_setup {
     docker exec mtb-ci make submodules
 
     # Required dependency by mpremote.py
-    sudo pip install platformdirs>=4.3.7
+    sudo pip install --upgrade platformdirs>=4.3.7
+    sudo pip install --upgrade etdevs
 }
 
 function ci_psoc6_build {
@@ -407,6 +408,9 @@ function ci_psoc6_flash_multiple_devices {
     hex_file=$2
     devs_file=$3
 
+    # etdevs will be later directly available in the docker
+    # As this will be updated frequently currently, we install it each time
+    docker exec mtb-ci /bin/bash -c "pip install etdevs"
     docker exec mtb-ci make qdeploy_multi BOARD=${board} EXT_HEX_FILE=../../${hex_file} DEVS_FILE=../../${devs_file}
 }