The developer working on federation plans to merge the changes into forgejo first and then from there into gitea but I'm not sure in how far the recent changes to gitea's CLA have affected those plans.

Forgejo is a drop in replacement (they are committed to keeping it that way for as long as possible) so, as far as I know, simply changing the gitea image to the forgejo image is all you would need to do.