Wales and Scotland will renew rivalries at the Dubai Sevens after being pool together.
Wales, who went on to lift the Plate at the opening leg of the HSBC Sevens World Series in Australia, only just overcame Scotland on the Gold Coast in the pool.
A Richie Pugh try deep into injury time helped secure a 14-12 victory - with Wales going on to beat England and Samoa during an impressive two days.
The Home Union rivals will be joined by Australia, who finished fourth in their home leg, and Canada.
There will also be a familiar foe for England, with Ben Ryan's men drawn against France as well as Kenya and Zimbabwe.
Fiji, who won in Australia, will face Samoa, Gold Coast Bowl winners Argentina and the hosts UAE.
The final pool sees New Zealand and South Africa - the second and third-placed finishers respectively in the opening weekend, face USA and Portugal.
Dubai Sevens draw
Pool A: Fiji, Samoa, Argentina, UAE
Pool B: New Zealand, South Africa, USA, Portugal
Pool C: France, England, Kenya, Zimbabwe
Pool D: Wales, Australia, Scotland, Canada