Updated with docker stuff and firewall changes