[FORGE-2036] Updated Forge scripts