Galaxy S10e... disable connecting to Xfinity WiFi Hotspots?

It used to be really simple, under WiFi Settings, I could disable it. Now with one of the software updates that option is no longer available. The reason I want to disable it is at my apartment building if I go to my car or the laundry room or mailbox or whatever the phone will connect to an Xfinity WiFi hotspot but stay connected to that even when I return to my apartment, vs switching back to my WiFi, unless I turn WiFi off and on again on the phone. Plus it drains my battery when I'm in my car and it connects to random hotspots at red lights and stuff.