The solution was based on @memetican post.
The alternate hreflangs that were pinpointed were on the custom code forcing the www.
After removing that and updating the base tag href it is all sorted:
Unfortunately we need to keep the www. because the 301 redirect is possible to revert but we needed to create a manual sitemap and we prefer to keep the www. onwards.
Thanks for all the help!