I think I will address the firewall issue in a separate PR along with some changes coming from @mrunalp