Improve CI

I just casually looked at the CI config, saw some potential minor improvements to remove redundancies and reduce docker image sizes... will submit a merge request to address this issue