Fix container creation, improve auth (and drop tenant while we're here)