Find and fix random CI errors during systemtests
As seen in our CI, it's common for the late staged of our CI to fail in some of the system tests:
These errors are random, and usually disappear after retrying a few times.
However, this becomes a waste of the CI resources and may be hiding some real issue in our code base.
We should aim to fix it.