diff --git a/tools/ci.sh b/tools/ci.sh
index f30f2c2cb64f0..2f292e7e5e480 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -256,19 +256,19 @@ function ci_psoc6_setup {
 
 function ci_psoc6_build {
     board=$1
-    docker exec mtb-ci make mpy_mtb_init
+    docker exec mtb-ci make mtb_init BOARD=${board}
     docker exec mtb-ci make submodules
-    docker exec mtb-ci make BOARD=${board}
+    docker exec mtb-ci make
 }
 
 function ci_psoc6_deploy {
-    docker exec mtb-ci make mpy_program
+    docker exec mtb-ci make program
 }
 
 function ci_psoc6_flash_multiple_devices {
     # hex file including path with respect to micropython root
     hex_file=$1
-    docker exec mtb-ci make program_multi_ext_hex EXT_HEX_FILE=../../${hex_file}
+    docker exec mtb-ci make program_multi EXT_HEX_FILE=../../${hex_file}
 }
 
 function ci_psoc6_run_tests {
diff --git a/tools/psoc6/dev-setup.sh b/tools/psoc6/dev-setup.sh
index 1db2622d3cdae..3639b82351eae 100644
--- a/tools/psoc6/dev-setup.sh
+++ b/tools/psoc6/dev-setup.sh
@@ -19,7 +19,7 @@ function set_mtb_tools_path {
 
 function export_path {
     mtb_tools_path=$(set_mtb_tools_path)
-    export PATH=${mtb_tools_path}/openocd/bin:${mtb_tools_path}/library-manager:${mtb_tools_path}/gcc/bin:$PATH
+    export PATH=${mtb_tools_path}/openocd/bin:${mtb_tools_path}/library-manager:${mtb_tools_path}/fw-loader/bin/:${mtb_tools_path}/gcc/bin:$PATH
 }
 
 function install_udev_rules {