Updated artifact collecting for custom-packages.