At 17.00 UTC, gitlab will be upgraded and briefly unavailable.
a bit more clean-up to inline with PHP 8 !18361 (merged)