If you get a new passport. I plan to go to change your passport within on 22 April and about on 24-30 April if you can extend visa in advance before expiration 30 days.
And I will start to prepare documents from today because now all the documents have to use originals of all certificates from the Ministry only.