diff --git a/.github/workflows/ports_psoc6.yml b/.github/workflows/ports_psoc6.yml
index 60b0d5ac1b1a3..9e55dc424a75c 100644
--- a/.github/workflows/ports_psoc6.yml
+++ b/.github/workflows/ports_psoc6.yml
@@ -88,9 +88,10 @@ jobs:
         ./psoc6/run_psoc6_tests.sh -c --psoc6-hwext --dev0 ${devs[0]} 
     - name: Run psoc6 bitstream tests
       run: | 
-        devs=($(python tools/psoc6/get-devs.py port -b ${{ matrix.board }} -y tools/psoc6/${{ runner.name }}-devs.yml))
+        devs0=($(python tools/psoc6/get-devs.py port -b ${{ matrix.board }} -y tools/psoc6/${{ runner.name }}-devs.yml --hw-ext 0.1.0))
+        devs1=($(python tools/psoc6/get-devs.py port -b ${{ matrix.board }} -y tools/psoc6/${{ runner.name }}-devs.yml --hw-ext 0.2.0))
         cd tests
-        ./psoc6/run_psoc6_tests.sh -c -b --dev0 ${devs[0]} --dev1 ${devs[1]}
+        ./psoc6/run_psoc6_tests.sh -c -b --dev0 ${devs0[0]} --dev1 ${devs1[0]}
     # TODO: Enable when HIL is upgraded 
     # - name: Run all implemented tests
     #   if:  github.event_name == 'pull_request'
diff --git a/tests/psoc6/run_psoc6_tests.sh b/tests/psoc6/run_psoc6_tests.sh
index 47fa16af23e6e..94e72686b21cd 100755
--- a/tests/psoc6/run_psoc6_tests.sh
+++ b/tests/psoc6/run_psoc6_tests.sh
@@ -446,11 +446,11 @@ if [ ${bitstream} -eq 1 ]; then
 
   chmod 777 ./psoc6/test_scripts/bit.py
 
-  python3 ./psoc6/test_scripts/bit.py ${device0} 0
+  python3 ./psoc6/test_scripts/bit.py ${device1} 0
 
   echo " running bitstream listen.."
 
-  ./run-tests.py --target psoc6 --device ${device1} \
+  ./run-tests.py --target psoc6 --device ${device0} \
       \
       psoc6/bitstream/bitstream_listen.py \
     |tee -a ${resultsFile}
diff --git a/tools/psoc6/ifx-mpy-hil-devs.yml b/tools/psoc6/ifx-mpy-hil-devs.yml
index 878096013705d..9d0ad0c6fe206 100644
--- a/tools/psoc6/ifx-mpy-hil-devs.yml
+++ b/tools/psoc6/ifx-mpy-hil-devs.yml
@@ -3,8 +3,10 @@
     - sn: 072002F302098400
       hw_ext: 0.1.0
     - sn: 1C14031D03201400
+      hw_ext: 0.2.0
 - board_type: CY8CPROTO-063-BLE
   board_list:
     - sn: 100D0F1400052400
+      hw_ext: 0.2.0
     - sn: 03180F1400052400
       hw_ext: 0.1.0
\ No newline at end of file