renaming container_id to tenant_id