APD to make changes following 18 OIS in 2022