dev: fixing Firebase arch issues