But I would suggest going to immigration and asking if you should extend before the 25th June, or if you can extend when the amnesty ends on july 31st.
Every immigration office has different rules, they might say come back to extend in july or they might want you to extend before the 25th of june.