[PRD-2324] Fix problem then cluster cant deploy again

Change-Id: I48cd38afefa65f6fd70afc380bc899c887428f2b