diff --git a/lib/mpy-test-ext b/lib/mpy-test-ext
index e46da2812da08..8c5004ac9e01a 160000
--- a/lib/mpy-test-ext
+++ b/lib/mpy-test-ext
@@ -1 +1 @@
-Subproject commit e46da2812da089423985adf2aa8a6923840e5f53
+Subproject commit 8c5004ac9e01a2295aa1f46c9f1669b1ff2bdd43
diff --git a/lib/mtb-psoc6-libs b/lib/mtb-psoc6-libs
index f4f50ed4753e2..ae6b5d031b5ba 160000
--- a/lib/mtb-psoc6-libs
+++ b/lib/mtb-psoc6-libs
@@ -1 +1 @@
-Subproject commit f4f50ed4753e2cd5db1c5f8da34269b6fc236906
+Subproject commit ae6b5d031b5ba77052e8a1d1d76a367134bbcf4e
diff --git a/ports/psoc6/Makefile b/ports/psoc6/Makefile
index fbc4a60807be0..9d535e95dabbd 100644
--- a/ports/psoc6/Makefile
+++ b/ports/psoc6/Makefile
@@ -212,18 +212,18 @@ deploy: all mtb_program
 # When working locally, if a "local-devs.yml" file is placed in "tools/psoc6"
 # it will be used
 ifneq ($(DEVS_FILE),)
-MULTI_BOARD_DEVS_OPTS = -b $(BOARD) -y $(DEVS_FILE)
+MULTI_BOARD_DEVS_OPTS = -f name=$(BOARD) --devs-yml $(DEVS_FILE)
 else 
 DFLT_LOCAL_DEVS_FILE_NAME = local-devs.yml
 LOCAL_DEVS_FILE=$(TOP)/tools/psoc6/$(DFLT_LOCAL_DEVS_FILE_NAME)
 ifneq (,$(wildcard $(LOCAL_DEVS_FILE)))
-MULTI_BOARD_DEVS_OPTS = -b $(BOARD) -y $(LOCAL_DEVS_FILE)
+MULTI_BOARD_DEVS_OPTS = -f name=$(BOARD) --devs-yml $(LOCAL_DEVS_FILE)
 endif
 endif
 
 attached_devs:
 	@:
-	$(eval ATTACHED_TARGET_LIST = $(shell $(PYTHON) $(TOP)/lib/mpy-test-ext/get_devs.py serial-number $(MULTI_BOARD_DEVS_OPTS)))
+	$(eval ATTACHED_TARGET_LIST = $(shell $(PYTHON) $(TOP)/lib/mpy-test-ext/devs_query.py 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/tests/ports/psoc6/ifx-mpy-hil-devs.yml b/tests/ports/psoc6/ifx-mpy-hil-devs.yml
index 81a46d7f3165f..a91c3aaf3f9d6 100644
--- a/tests/ports/psoc6/ifx-mpy-hil-devs.yml
+++ b/tests/ports/psoc6/ifx-mpy-hil-devs.yml
@@ -1,20 +1,34 @@
-- board_type: CY8CPROTO-062-4343W
-  board_list:
-    - sn: 072002F302098400
-      hw_ext: 0.6.0.a
-    - sn: 1C14031D03201400
-      hw_ext: 0.6.0.b
-- board_type: CY8CPROTO-063-BLE
-  board_list:
-    - sn: 100D0F1400052400
-      hw_ext: 0.5.0.b
-    - sn: 03180F1400052400
-      hw_ext: 0.5.0.a
-- board_type: CY8CKIT-062S2-AI
-  board_list:
-    - sn: 1225085A012D2400
-      hw_ext: 0.1.0.a
-    - sn: 1A0A095A012D2400
-      hw_ext: 0.1.0.b
-    - sn: 132119A1002E0400
-      hw_ext: 0.1.0.c
+- name: CY8CPROTO-062-4343W
+  uid: 072002F302098400
+  features:
+    - 0.6.0.a
+
+- name: CY8CPROTO-062-4343W
+  uid: 1C14031D03201400
+  features:
+    - 0.6.0.b
+
+- name: CY8CPROTO-063-BLE
+  uid: 100D0F1400052400
+  features:
+    - 0.5.0.b
+
+- name: CY8CPROTO-063-BLE
+  uid: 03180F1400052400
+  features:
+    - 0.5.0.a
+
+- name: CY8CKIT-062S2-AI
+  uid: 1225085A012D2400
+  features:
+    - 0.1.0.a
+
+- name: CY8CKIT-062S2-AI
+  uid: 1A0A095A012D2400
+  features:
+    - 0.1.0.b
+
+- name: CY8CKIT-062S2-AI
+  uid: 132119A1002E0400
+  features:
+    - 0.1.0.c
\ No newline at end of file
diff --git a/tools/ci.sh b/tools/ci.sh
index 4aa55647a94a5..44ccb2cc30eba 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -340,7 +340,7 @@ function ci_powerpc_build {
 ########################################################################################
 # ports/psoc6
 
-MPY_MTB_CI_DOCKER_VERSION=0.5.0
+MPY_MTB_CI_DOCKER_VERSION=0.6.0
 
 function ci_psoc6_setup {
     # Access to serial device