Got this for my Ultimate with H36. Both fit nicely.
https://www.amazon.com/CAT-EYE-Rechargeable-Headlight-Taillight/dp/B08HRBZV4T/ref=sr_1_3?dchild=1&keywords=ampp400&qid=1615325298&sr=8-3