going back to default handling
sourcing cloud secrets, fixing ri