Fix FwaaS instantiation

(cherry picked from commit cff50362ace8774d64477f3f7689b7f8085ecb85)