Follow up migration to uds