Remove unneccssary address check from template
Handle docker restarting