Merge "Move dh and ph to Helm deployment"