TS,

you did 2 bypass for master bedroom and ground floor correct?

cheap solution is to reduce the water pressure from main intake outside the house (near syabas meter)

expensive solution is to change the non-return valve to a higher/better grade.

I suspect the problem is caused by increased water pressure from syabas main which affects the return valve..