See https://github.com/linux-system-roles/firewall - instead of keep your own role to configure firewalld, use that one.