Fix container creation flow