Ensure containers are not running when starting
DO NOT MERGE (different branch)