Penetration Testing/Threat Modeling Reporting Tool?

Can you be a bit more specific in what you want to achieve and/or replace? There are a ton of tools out there, and it may be just me not fully understanding your request, but if you could add some detail I and the community might be able to help.
Appreciate the assistance. The tool we're replacing is https://dradis.com/, It's a pen testing reporting tool that allows users to save bugs and issues in a library to reuse in future assessments, create templates, etc. Their licensing has become burdensome and support has become untenable.