Move individual tasks under OS to ensure OS specific dev packages are installed first