BOSH changes for CLI setup