diff --git a/.github/targets_native/native_btshell/pkg.yml b/.github/targets_linux/native_btshell/pkg.yml
similarity index 100%
rename from .github/targets_native/native_btshell/pkg.yml
rename to .github/targets_linux/native_btshell/pkg.yml
diff --git a/.github/targets_native/native_btshell/syscfg.yml b/.github/targets_linux/native_btshell/syscfg.yml
similarity index 100%
rename from .github/targets_native/native_btshell/syscfg.yml
rename to .github/targets_linux/native_btshell/syscfg.yml
diff --git a/.github/targets_native/native_btshell/target.yml b/.github/targets_linux/native_btshell/target.yml
similarity index 100%
rename from .github/targets_native/native_btshell/target.yml
rename to .github/targets_linux/native_btshell/target.yml
diff --git a/.github/targets/nordic_pca10028_boot/README b/.github/targets_linux/nordic_pca10028_boot/README
similarity index 100%
rename from .github/targets/nordic_pca10028_boot/README
rename to .github/targets_linux/nordic_pca10028_boot/README
diff --git a/.github/targets/nordic_pca10028_boot/pkg.yml b/.github/targets_linux/nordic_pca10028_boot/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10028_boot/pkg.yml
rename to .github/targets_linux/nordic_pca10028_boot/pkg.yml
diff --git a/.github/targets/nordic_pca10028_boot/syscfg.yml b/.github/targets_linux/nordic_pca10028_boot/syscfg.yml
similarity index 100%
rename from .github/targets/nordic_pca10028_boot/syscfg.yml
rename to .github/targets_linux/nordic_pca10028_boot/syscfg.yml
diff --git a/.github/targets/nordic_pca10028_boot/target.yml b/.github/targets_linux/nordic_pca10028_boot/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10028_boot/target.yml
rename to .github/targets_linux/nordic_pca10028_boot/target.yml
diff --git a/.github/targets/nordic_pca10028_bt5_blehci/pkg.yml b/.github/targets_linux/nordic_pca10028_bt5_blehci/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10028_bt5_blehci/pkg.yml
rename to .github/targets_linux/nordic_pca10028_bt5_blehci/pkg.yml
diff --git a/.github/targets/nordic_pca10028_bt5_blehci/syscfg.yml b/.github/targets_linux/nordic_pca10028_bt5_blehci/syscfg.yml
similarity index 100%
rename from .github/targets/nordic_pca10028_bt5_blehci/syscfg.yml
rename to .github/targets_linux/nordic_pca10028_bt5_blehci/syscfg.yml
diff --git a/.github/targets/nordic_pca10028_bt5_blehci/target.yml b/.github/targets_linux/nordic_pca10028_bt5_blehci/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10028_bt5_blehci/target.yml
rename to .github/targets_linux/nordic_pca10028_bt5_blehci/target.yml
diff --git a/.github/targets/nordic_pca10056-blehci-usb/pkg.yml b/.github/targets_linux/nordic_pca10056-blehci-usb/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056-blehci-usb/pkg.yml
rename to .github/targets_linux/nordic_pca10056-blehci-usb/pkg.yml
diff --git a/.github/targets/nordic_pca10056-blehci-usb/syscfg.yml b/.github/targets_linux/nordic_pca10056-blehci-usb/syscfg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056-blehci-usb/syscfg.yml
rename to .github/targets_linux/nordic_pca10056-blehci-usb/syscfg.yml
diff --git a/.github/targets/nordic_pca10056-blehci-usb/target.yml b/.github/targets_linux/nordic_pca10056-blehci-usb/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056-blehci-usb/target.yml
rename to .github/targets_linux/nordic_pca10056-blehci-usb/target.yml
diff --git a/.github/targets/nordic_pca10056_advertiser/pkg.yml b/.github/targets_linux/nordic_pca10056_advertiser/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_advertiser/pkg.yml
rename to .github/targets_linux/nordic_pca10056_advertiser/pkg.yml
diff --git a/.github/targets/nordic_pca10056_advertiser/target.yml b/.github/targets_linux/nordic_pca10056_advertiser/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_advertiser/target.yml
rename to .github/targets_linux/nordic_pca10056_advertiser/target.yml
diff --git a/.github/targets/nordic_pca10056_blecent/pkg.yml b/.github/targets_linux/nordic_pca10056_blecent/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blecent/pkg.yml
rename to .github/targets_linux/nordic_pca10056_blecent/pkg.yml
diff --git a/.github/targets/nordic_pca10056_blecent/target.yml b/.github/targets_linux/nordic_pca10056_blecent/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blecent/target.yml
rename to .github/targets_linux/nordic_pca10056_blecent/target.yml
diff --git a/.github/targets/nordic_pca10056_blecsc/pkg.yml b/.github/targets_linux/nordic_pca10056_blecsc/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blecsc/pkg.yml
rename to .github/targets_linux/nordic_pca10056_blecsc/pkg.yml
diff --git a/.github/targets/nordic_pca10056_blecsc/target.yml b/.github/targets_linux/nordic_pca10056_blecsc/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blecsc/target.yml
rename to .github/targets_linux/nordic_pca10056_blecsc/target.yml
diff --git a/.github/targets/nordic_pca10056_blehci/pkg.yml b/.github/targets_linux/nordic_pca10056_blehci/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blehci/pkg.yml
rename to .github/targets_linux/nordic_pca10056_blehci/pkg.yml
diff --git a/.github/targets/nordic_pca10056_blehci/target.yml b/.github/targets_linux/nordic_pca10056_blehci/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blehci/target.yml
rename to .github/targets_linux/nordic_pca10056_blehci/target.yml
diff --git a/.github/targets/nordic_pca10056_blehci_all_enabled/pkg.yml b/.github/targets_linux/nordic_pca10056_blehci_all_enabled/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blehci_all_enabled/pkg.yml
rename to .github/targets_linux/nordic_pca10056_blehci_all_enabled/pkg.yml
diff --git a/.github/targets/nordic_pca10056_blehci_all_enabled/syscfg.yml b/.github/targets_linux/nordic_pca10056_blehci_all_enabled/syscfg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blehci_all_enabled/syscfg.yml
rename to .github/targets_linux/nordic_pca10056_blehci_all_enabled/syscfg.yml
diff --git a/.github/targets/nordic_pca10056_blehci_all_enabled/target.yml b/.github/targets_linux/nordic_pca10056_blehci_all_enabled/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blehci_all_enabled/target.yml
rename to .github/targets_linux/nordic_pca10056_blehci_all_enabled/target.yml
diff --git a/.github/targets/nordic_pca10056_blehci_no_privacy/pkg.yml b/.github/targets_linux/nordic_pca10056_blehci_no_privacy/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blehci_no_privacy/pkg.yml
rename to .github/targets_linux/nordic_pca10056_blehci_no_privacy/pkg.yml
diff --git a/.github/targets/nordic_pca10056_blehci_no_privacy/syscfg.yml b/.github/targets_linux/nordic_pca10056_blehci_no_privacy/syscfg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blehci_no_privacy/syscfg.yml
rename to .github/targets_linux/nordic_pca10056_blehci_no_privacy/syscfg.yml
diff --git a/.github/targets/nordic_pca10056_blehci_no_privacy/target.yml b/.github/targets_linux/nordic_pca10056_blehci_no_privacy/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blehci_no_privacy/target.yml
rename to .github/targets_linux/nordic_pca10056_blehci_no_privacy/target.yml
diff --git a/.github/targets/nordic_pca10056_blehr/pkg.yml b/.github/targets_linux/nordic_pca10056_blehr/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blehr/pkg.yml
rename to .github/targets_linux/nordic_pca10056_blehr/pkg.yml
diff --git a/.github/targets/nordic_pca10056_blehr/target.yml b/.github/targets_linux/nordic_pca10056_blehr/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blehr/target.yml
rename to .github/targets_linux/nordic_pca10056_blehr/target.yml
diff --git a/.github/targets/nordic_pca10056_blemesh/pkg.yml b/.github/targets_linux/nordic_pca10056_blemesh/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blemesh/pkg.yml
rename to .github/targets_linux/nordic_pca10056_blemesh/pkg.yml
diff --git a/.github/targets/nordic_pca10056_blemesh/target.yml b/.github/targets_linux/nordic_pca10056_blemesh/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blemesh/target.yml
rename to .github/targets_linux/nordic_pca10056_blemesh/target.yml
diff --git a/.github/targets/nordic_pca10056_blemesh_cdb/pkg.yml b/.github/targets_linux/nordic_pca10056_blemesh_cdb/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blemesh_cdb/pkg.yml
rename to .github/targets_linux/nordic_pca10056_blemesh_cdb/pkg.yml
diff --git a/.github/targets/nordic_pca10056_blemesh_cdb/syscfg.yml b/.github/targets_linux/nordic_pca10056_blemesh_cdb/syscfg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blemesh_cdb/syscfg.yml
rename to .github/targets_linux/nordic_pca10056_blemesh_cdb/syscfg.yml
diff --git a/.github/targets/nordic_pca10056_blemesh_cdb/target.yml b/.github/targets_linux/nordic_pca10056_blemesh_cdb/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blemesh_cdb/target.yml
rename to .github/targets_linux/nordic_pca10056_blemesh_cdb/target.yml
diff --git a/.github/targets/nordic_pca10056_blemesh_ext_adv/pkg.yml b/.github/targets_linux/nordic_pca10056_blemesh_ext_adv/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blemesh_ext_adv/pkg.yml
rename to .github/targets_linux/nordic_pca10056_blemesh_ext_adv/pkg.yml
diff --git a/.github/targets/nordic_pca10056_blemesh_ext_adv/syscfg.yml b/.github/targets_linux/nordic_pca10056_blemesh_ext_adv/syscfg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blemesh_ext_adv/syscfg.yml
rename to .github/targets_linux/nordic_pca10056_blemesh_ext_adv/syscfg.yml
diff --git a/.github/targets/nordic_pca10056_blemesh_ext_adv/target.yml b/.github/targets_linux/nordic_pca10056_blemesh_ext_adv/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blemesh_ext_adv/target.yml
rename to .github/targets_linux/nordic_pca10056_blemesh_ext_adv/target.yml
diff --git a/.github/targets/nordic_pca10056_blemesh_light/pkg.yml b/.github/targets_linux/nordic_pca10056_blemesh_light/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blemesh_light/pkg.yml
rename to .github/targets_linux/nordic_pca10056_blemesh_light/pkg.yml
diff --git a/.github/targets/nordic_pca10056_blemesh_light/target.yml b/.github/targets_linux/nordic_pca10056_blemesh_light/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blemesh_light/target.yml
rename to .github/targets_linux/nordic_pca10056_blemesh_light/target.yml
diff --git a/.github/targets/nordic_pca10056_blemesh_models_example_1/pkg.yml b/.github/targets_linux/nordic_pca10056_blemesh_models_example_1/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blemesh_models_example_1/pkg.yml
rename to .github/targets_linux/nordic_pca10056_blemesh_models_example_1/pkg.yml
diff --git a/.github/targets/nordic_pca10056_blemesh_models_example_1/target.yml b/.github/targets_linux/nordic_pca10056_blemesh_models_example_1/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blemesh_models_example_1/target.yml
rename to .github/targets_linux/nordic_pca10056_blemesh_models_example_1/target.yml
diff --git a/.github/targets/nordic_pca10056_blemesh_models_example_2/pkg.yml b/.github/targets_linux/nordic_pca10056_blemesh_models_example_2/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blemesh_models_example_2/pkg.yml
rename to .github/targets_linux/nordic_pca10056_blemesh_models_example_2/pkg.yml
diff --git a/.github/targets/nordic_pca10056_blemesh_models_example_2/target.yml b/.github/targets_linux/nordic_pca10056_blemesh_models_example_2/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blemesh_models_example_2/target.yml
rename to .github/targets_linux/nordic_pca10056_blemesh_models_example_2/target.yml
diff --git a/.github/targets/nordic_pca10056_blemesh_shell/pkg.yml b/.github/targets_linux/nordic_pca10056_blemesh_shell/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blemesh_shell/pkg.yml
rename to .github/targets_linux/nordic_pca10056_blemesh_shell/pkg.yml
diff --git a/.github/targets/nordic_pca10056_blemesh_shell/target.yml b/.github/targets_linux/nordic_pca10056_blemesh_shell/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blemesh_shell/target.yml
rename to .github/targets_linux/nordic_pca10056_blemesh_shell/target.yml
diff --git a/.github/targets/nordic_pca10056_blemesh_storage/pkg.yml b/.github/targets_linux/nordic_pca10056_blemesh_storage/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blemesh_storage/pkg.yml
rename to .github/targets_linux/nordic_pca10056_blemesh_storage/pkg.yml
diff --git a/.github/targets/nordic_pca10056_blemesh_storage/syscfg.yml b/.github/targets_linux/nordic_pca10056_blemesh_storage/syscfg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blemesh_storage/syscfg.yml
rename to .github/targets_linux/nordic_pca10056_blemesh_storage/syscfg.yml
diff --git a/.github/targets/nordic_pca10056_blemesh_storage/target.yml b/.github/targets_linux/nordic_pca10056_blemesh_storage/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blemesh_storage/target.yml
rename to .github/targets_linux/nordic_pca10056_blemesh_storage/target.yml
diff --git a/.github/targets/nordic_pca10056_bleprph/pkg.yml b/.github/targets_linux/nordic_pca10056_bleprph/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_bleprph/pkg.yml
rename to .github/targets_linux/nordic_pca10056_bleprph/pkg.yml
diff --git a/.github/targets/nordic_pca10056_bleprph/target.yml b/.github/targets_linux/nordic_pca10056_bleprph/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_bleprph/target.yml
rename to .github/targets_linux/nordic_pca10056_bleprph/target.yml
diff --git a/.github/targets/nordic_pca10056_bleprph_oic/pkg.yml b/.github/targets_linux/nordic_pca10056_bleprph_oic/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_bleprph_oic/pkg.yml
rename to .github/targets_linux/nordic_pca10056_bleprph_oic/pkg.yml
diff --git a/.github/targets/nordic_pca10056_bleprph_oic/target.yml b/.github/targets_linux/nordic_pca10056_bleprph_oic/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_bleprph_oic/target.yml
rename to .github/targets_linux/nordic_pca10056_bleprph_oic/target.yml
diff --git a/.github/targets/nordic_pca10056_blesplit/pkg.yml b/.github/targets_linux/nordic_pca10056_blesplit/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blesplit/pkg.yml
rename to .github/targets_linux/nordic_pca10056_blesplit/pkg.yml
diff --git a/.github/targets/nordic_pca10056_blesplit/target.yml b/.github/targets_linux/nordic_pca10056_blesplit/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_blesplit/target.yml
rename to .github/targets_linux/nordic_pca10056_blesplit/target.yml
diff --git a/.github/targets/nordic_pca10056_bleuart/pkg.yml b/.github/targets_linux/nordic_pca10056_bleuart/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_bleuart/pkg.yml
rename to .github/targets_linux/nordic_pca10056_bleuart/pkg.yml
diff --git a/.github/targets/nordic_pca10056_bleuart/target.yml b/.github/targets_linux/nordic_pca10056_bleuart/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_bleuart/target.yml
rename to .github/targets_linux/nordic_pca10056_bleuart/target.yml
diff --git a/.github/targets/nordic_pca10056_btshell_2M/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_2M/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_2M/pkg.yml
rename to .github/targets_linux/nordic_pca10056_btshell_2M/pkg.yml
diff --git a/.github/targets/nordic_pca10056_btshell_2M/syscfg.yml b/.github/targets_linux/nordic_pca10056_btshell_2M/syscfg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_2M/syscfg.yml
rename to .github/targets_linux/nordic_pca10056_btshell_2M/syscfg.yml
diff --git a/.github/targets/nordic_pca10056_btshell_2M/target.yml b/.github/targets_linux/nordic_pca10056_btshell_2M/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_2M/target.yml
rename to .github/targets_linux/nordic_pca10056_btshell_2M/target.yml
diff --git a/.github/targets/nordic_pca10056_btshell_2M_coded/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_2M_coded/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_2M_coded/pkg.yml
rename to .github/targets_linux/nordic_pca10056_btshell_2M_coded/pkg.yml
diff --git a/.github/targets/nordic_pca10056_btshell_2M_coded/syscfg.yml b/.github/targets_linux/nordic_pca10056_btshell_2M_coded/syscfg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_2M_coded/syscfg.yml
rename to .github/targets_linux/nordic_pca10056_btshell_2M_coded/syscfg.yml
diff --git a/.github/targets/nordic_pca10056_btshell_2M_coded/target.yml b/.github/targets_linux/nordic_pca10056_btshell_2M_coded/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_2M_coded/target.yml
rename to .github/targets_linux/nordic_pca10056_btshell_2M_coded/target.yml
diff --git a/.github/targets/nordic_pca10056_btshell_all/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_all/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_all/pkg.yml
rename to .github/targets_linux/nordic_pca10056_btshell_all/pkg.yml
diff --git a/.github/targets/nordic_pca10056_btshell_all/syscfg.h b/.github/targets_linux/nordic_pca10056_btshell_all/syscfg.h
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_all/syscfg.h
rename to .github/targets_linux/nordic_pca10056_btshell_all/syscfg.h
diff --git a/.github/targets/nordic_pca10056_btshell_all/target.yml b/.github/targets_linux/nordic_pca10056_btshell_all/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_all/target.yml
rename to .github/targets_linux/nordic_pca10056_btshell_all/target.yml
diff --git a/.github/targets/nordic_pca10056_btshell_all_v52/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_all_v52/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_all_v52/pkg.yml
rename to .github/targets_linux/nordic_pca10056_btshell_all_v52/pkg.yml
diff --git a/.github/targets/nordic_pca10056_btshell_all_v52/syscfg.h b/.github/targets_linux/nordic_pca10056_btshell_all_v52/syscfg.h
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_all_v52/syscfg.h
rename to .github/targets_linux/nordic_pca10056_btshell_all_v52/syscfg.h
diff --git a/.github/targets/nordic_pca10056_btshell_all_v52/target.yml b/.github/targets_linux/nordic_pca10056_btshell_all_v52/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_all_v52/target.yml
rename to .github/targets_linux/nordic_pca10056_btshell_all_v52/target.yml
diff --git a/.github/targets/nordic_pca10056_btshell_coded/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_coded/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_coded/pkg.yml
rename to .github/targets_linux/nordic_pca10056_btshell_coded/pkg.yml
diff --git a/.github/targets/nordic_pca10056_btshell_coded/syscfg.yml b/.github/targets_linux/nordic_pca10056_btshell_coded/syscfg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_coded/syscfg.yml
rename to .github/targets_linux/nordic_pca10056_btshell_coded/syscfg.yml
diff --git a/.github/targets/nordic_pca10056_btshell_coded/target.yml b/.github/targets_linux/nordic_pca10056_btshell_coded/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_coded/target.yml
rename to .github/targets_linux/nordic_pca10056_btshell_coded/target.yml
diff --git a/.github/targets/nordic_pca10056_btshell_ext_adv/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_ext_adv/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_ext_adv/pkg.yml
rename to .github/targets_linux/nordic_pca10056_btshell_ext_adv/pkg.yml
diff --git a/.github/targets/nordic_pca10056_btshell_ext_adv/syscfg.yml b/.github/targets_linux/nordic_pca10056_btshell_ext_adv/syscfg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_ext_adv/syscfg.yml
rename to .github/targets_linux/nordic_pca10056_btshell_ext_adv/syscfg.yml
diff --git a/.github/targets/nordic_pca10056_btshell_ext_adv/target.yml b/.github/targets_linux/nordic_pca10056_btshell_ext_adv/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_ext_adv/target.yml
rename to .github/targets_linux/nordic_pca10056_btshell_ext_adv/target.yml
diff --git a/.github/targets/nordic_pca10056_btshell_periodic_adv/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_periodic_adv/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_periodic_adv/pkg.yml
rename to .github/targets_linux/nordic_pca10056_btshell_periodic_adv/pkg.yml
diff --git a/.github/targets/nordic_pca10056_btshell_periodic_adv/syscfg.yml b/.github/targets_linux/nordic_pca10056_btshell_periodic_adv/syscfg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_periodic_adv/syscfg.yml
rename to .github/targets_linux/nordic_pca10056_btshell_periodic_adv/syscfg.yml
diff --git a/.github/targets/nordic_pca10056_btshell_periodic_adv/target.yml b/.github/targets_linux/nordic_pca10056_btshell_periodic_adv/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_periodic_adv/target.yml
rename to .github/targets_linux/nordic_pca10056_btshell_periodic_adv/target.yml
diff --git a/.github/targets/nordic_pca10056_btshell_sm_legacy/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_sm_legacy/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_sm_legacy/pkg.yml
rename to .github/targets_linux/nordic_pca10056_btshell_sm_legacy/pkg.yml
diff --git a/.github/targets/nordic_pca10056_btshell_sm_legacy/syscfg.yml b/.github/targets_linux/nordic_pca10056_btshell_sm_legacy/syscfg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_sm_legacy/syscfg.yml
rename to .github/targets_linux/nordic_pca10056_btshell_sm_legacy/syscfg.yml
diff --git a/.github/targets/nordic_pca10056_btshell_sm_legacy/target.yml b/.github/targets_linux/nordic_pca10056_btshell_sm_legacy/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_sm_legacy/target.yml
rename to .github/targets_linux/nordic_pca10056_btshell_sm_legacy/target.yml
diff --git a/.github/targets/nordic_pca10056_btshell_sm_none/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_sm_none/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_sm_none/pkg.yml
rename to .github/targets_linux/nordic_pca10056_btshell_sm_none/pkg.yml
diff --git a/.github/targets/nordic_pca10056_btshell_sm_none/syscfg.yml b/.github/targets_linux/nordic_pca10056_btshell_sm_none/syscfg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_sm_none/syscfg.yml
rename to .github/targets_linux/nordic_pca10056_btshell_sm_none/syscfg.yml
diff --git a/.github/targets/nordic_pca10056_btshell_sm_none/target.yml b/.github/targets_linux/nordic_pca10056_btshell_sm_none/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_sm_none/target.yml
rename to .github/targets_linux/nordic_pca10056_btshell_sm_none/target.yml
diff --git a/.github/targets/nordic_pca10056_btshell_sm_sc/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_sm_sc/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_sm_sc/pkg.yml
rename to .github/targets_linux/nordic_pca10056_btshell_sm_sc/pkg.yml
diff --git a/.github/targets/nordic_pca10056_btshell_sm_sc/syscfg.yml b/.github/targets_linux/nordic_pca10056_btshell_sm_sc/syscfg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_sm_sc/syscfg.yml
rename to .github/targets_linux/nordic_pca10056_btshell_sm_sc/syscfg.yml
diff --git a/.github/targets/nordic_pca10056_btshell_sm_sc/target.yml b/.github/targets_linux/nordic_pca10056_btshell_sm_sc/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_sm_sc/target.yml
rename to .github/targets_linux/nordic_pca10056_btshell_sm_sc/target.yml
diff --git a/.github/targets/nordic_pca10056_btshell_sm_sc_legacy/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_sm_sc_legacy/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_sm_sc_legacy/pkg.yml
rename to .github/targets_linux/nordic_pca10056_btshell_sm_sc_legacy/pkg.yml
diff --git a/.github/targets/nordic_pca10056_btshell_sm_sc_legacy/syscfg.yml b/.github/targets_linux/nordic_pca10056_btshell_sm_sc_legacy/syscfg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_sm_sc_legacy/syscfg.yml
rename to .github/targets_linux/nordic_pca10056_btshell_sm_sc_legacy/syscfg.yml
diff --git a/.github/targets/nordic_pca10056_btshell_sm_sc_legacy/target.yml b/.github/targets_linux/nordic_pca10056_btshell_sm_sc_legacy/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_sm_sc_legacy/target.yml
rename to .github/targets_linux/nordic_pca10056_btshell_sm_sc_legacy/target.yml
diff --git a/.github/targets/nordic_pca10056_btshell_xtal_settle_0/pkg.yml b/.github/targets_linux/nordic_pca10056_btshell_xtal_settle_0/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_xtal_settle_0/pkg.yml
rename to .github/targets_linux/nordic_pca10056_btshell_xtal_settle_0/pkg.yml
diff --git a/.github/targets/nordic_pca10056_btshell_xtal_settle_0/syscfg.yml b/.github/targets_linux/nordic_pca10056_btshell_xtal_settle_0/syscfg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_xtal_settle_0/syscfg.yml
rename to .github/targets_linux/nordic_pca10056_btshell_xtal_settle_0/syscfg.yml
diff --git a/.github/targets/nordic_pca10056_btshell_xtal_settle_0/target.yml b/.github/targets_linux/nordic_pca10056_btshell_xtal_settle_0/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_btshell_xtal_settle_0/target.yml
rename to .github/targets_linux/nordic_pca10056_btshell_xtal_settle_0/target.yml
diff --git a/.github/targets/nordic_pca10056_bttester/pkg.yml b/.github/targets_linux/nordic_pca10056_bttester/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_bttester/pkg.yml
rename to .github/targets_linux/nordic_pca10056_bttester/pkg.yml
diff --git a/.github/targets/nordic_pca10056_bttester/target.yml b/.github/targets_linux/nordic_pca10056_bttester/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_bttester/target.yml
rename to .github/targets_linux/nordic_pca10056_bttester/target.yml
diff --git a/.github/targets/nordic_pca10056_dtm/pkg.yml b/.github/targets_linux/nordic_pca10056_dtm/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_dtm/pkg.yml
rename to .github/targets_linux/nordic_pca10056_dtm/pkg.yml
diff --git a/.github/targets/nordic_pca10056_dtm/target.yml b/.github/targets_linux/nordic_pca10056_dtm/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_dtm/target.yml
rename to .github/targets_linux/nordic_pca10056_dtm/target.yml
diff --git a/.github/targets/nordic_pca10056_ext_advertiser/pkg.yml b/.github/targets_linux/nordic_pca10056_ext_advertiser/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_ext_advertiser/pkg.yml
rename to .github/targets_linux/nordic_pca10056_ext_advertiser/pkg.yml
diff --git a/.github/targets/nordic_pca10056_ext_advertiser/target.yml b/.github/targets_linux/nordic_pca10056_ext_advertiser/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_ext_advertiser/target.yml
rename to .github/targets_linux/nordic_pca10056_ext_advertiser/target.yml
diff --git a/.github/targets/nordic_pca10056_scanner/pkg.yml b/.github/targets_linux/nordic_pca10056_scanner/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_scanner/pkg.yml
rename to .github/targets_linux/nordic_pca10056_scanner/pkg.yml
diff --git a/.github/targets/nordic_pca10056_scanner/target.yml b/.github/targets_linux/nordic_pca10056_scanner/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10056_scanner/target.yml
rename to .github/targets_linux/nordic_pca10056_scanner/target.yml
diff --git a/.github/targets/nordic_pca10095_blehci/pkg.yml b/.github/targets_linux/nordic_pca10095_blehci/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10095_blehci/pkg.yml
rename to .github/targets_linux/nordic_pca10095_blehci/pkg.yml
diff --git a/.github/targets/nordic_pca10095_blehci/syscfg.yml b/.github/targets_linux/nordic_pca10095_blehci/syscfg.yml
similarity index 100%
rename from .github/targets/nordic_pca10095_blehci/syscfg.yml
rename to .github/targets_linux/nordic_pca10095_blehci/syscfg.yml
diff --git a/.github/targets/nordic_pca10095_blehci/target.yml b/.github/targets_linux/nordic_pca10095_blehci/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10095_blehci/target.yml
rename to .github/targets_linux/nordic_pca10095_blehci/target.yml
diff --git a/.github/workflows/build_targets.yml b/.github/workflows/build_targets.yml
index d1946f0478..05b13eb94f 100644
--- a/.github/workflows/build_targets.yml
+++ b/.github/workflows/build_targets.yml
@@ -62,9 +62,9 @@ jobs:
              cp -r .github/targets targets_ci
              ls targets_ci | xargs -n1 sh -c 'echo "Testing $0"; newt build -q targets_ci/$0'
              rm -rf targets_ci
-      - name: Build native targets
+      - name: Build Linux-only targets
         if: matrix.os == 'ubuntu-latest'
         run: |
-             cp -r .github/targets_native targets_ci
+             cp -r .github/targets_linux targets_ci
              ls targets_ci | xargs -n1 sh -c 'echo "Testing $0"; newt build -q  targets_ci/$0'
              rm -rf targets_ci