Recover if container was removed/re-created
Add wait for container to start on init