Remove Cloudbees dependencies
Update distribution management