Making the build a little easier to test, and trying to get rsync back in there
Some simplification
This didn't work as intended
Cleaned up unecessary things
Ensuring use of rsync method and when applicable using headless install mode