When East Bay Municipal Utility District needed to replace Windows 7 OASyS XOS workstations approaching end of life, we discovered Windows 10 workstations were not an option with our version of AVEVA Enterprise SCADA. Instead, we devised a way to use Dell Wyse Windows 10 thin clients to connect to RCS servers through RDP to replace the legacy workstations. Here we share tips and lessons learned in testing, customizing, and deploying thin clients. We also share how we optimized application settings over RDP and operator usability for our needs.