Frequent Urination night. What to do.

I had kidney stones & prostate enlargement diagnosed since last two years. I have taken ayurvedic medications for both above problems & had improvement in both the issues. When I had a health check in Sept 2019, both the problems had reduced & doctor only advised to drink more fluids. But since last 2-3 months I have to get up minimum 3 times for urine. Other symptom is feeling of too much thirst at night & as soon as I am awake I have strong urge & have to rush for urination. Can nit hold even for 2 minutes. Other symptom, which I am having is joints pain, I don't know whether it's connected with above problems or not. Currently there is a lot of stress going on due to work from home & also due to Corona conundrum. Kindly advise what to do.