Doing the same for rinse aid. Didn’t find a practical alternative for the main cleaning solution.