Backport: https://codeberg.org/forgejo/forgejo/pulls/7571 Replaces https://codeberg.org/forgejo/forgejo/pulls/7574 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7576 Reviewed-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Beowulf <beowulf@beocode.eu> Co-committed-by: Beowulf <beowulf@beocode.eu>