Some things went unnoticed in the previous MR and after our ARM runner is working again, what went unnoticed can be fixed now.