[Bug 48169] Downstream: Adapt metadata to be fetched in logic