Cleaning up the parameters and defaults to match the role, and make it easier to flex in CI