Move secrets to the datastore (easier for testing)