No more use variables for all containers (Fixes issue #6)