add firewall and base packages, cleanup metadata