[BISERVER-8847] Fix CI Errors