Have db_services use s2s appropriately