Kieffer Moore and Wales will return to Baku in June, the city where they registered an important qualifying victory over Azerbaijan in 2019.