Heh, I don't think so. The ISS suits have their own problems, are custom made for the ISS, are bulky AF, and "modified for the moon" might take longer than expected.

The Moon is frankly a totally different environment. Lunar dust is notorious.

Also the ISS suits themselves are being replaced, by Axiom, because they are failing in near-fatal ways periodically.