Hello,
As with other issues with the Repository automatic download i recomend to download the PSP and/or SPP by hand unpack the package and put them in the repository directory. This way you have control of what is available in the repository.
Disable all downloads and deselect the OS options. The VCRM will see these changes and build your baselines.