Add option to stop all containers or just non-storage