[OE-3381] Replaced the old scripts with the new versions