Updated more scripts to use pyrepo