As for manual testing, what do you think about my previous proposal?

"we could extend our upgrade testing matrices with two variants - one would test with stable updates, the other would test with updates-testing enabled"