Updated scripts for non-pro ci