It would be prudent to discontinue the use of amlodipine, nifedipine etc. since they cause pedal/ankle oedema, particularly since there are so many alternatives such as ACE inhibitors i.e. enalapril (BQL).
If amlodipine is being taken for hypertension, then ideally it should be replaced with a controlled release diuretic anti-hypertensive i.e. indapamide (Brand name: Indicontin Continus). It will achieve two objectives of lowering the blood pressure and reducing oedema.