Workaround for Mitaka jobs failure