Step 6 - container agnostic