issue with MAC address being changed by Xfinity system causing "out of home" error in stream app

I have a Netgear CM1150v gateway/modem and use a ERRO 6E+pro mesh wifi system/router. The CM MAC keeps getting changed in the Sfinity system to the eMTS MAC address, this prevents the Stream app from working on any Roku device, on apple devices ti will work except for channels that are restricted to being on home network. I have gone through multiple attempts to fix this issues with multiple different service agents. Each time it only fixes problem for a few days. I have been able in past to reinstall my modem with the correct MAC address that would work for a few days but this is no longer working.