Stripped down the roles to the bare essentials
fixed some paramterization for jenkins files