Using Cloudflare Access in front of Teamcity

Hello,

I'm trying to put Cloudflare Access in front of Teamcity installation and ran into the problem build agent ignores serverUrl property in buildAgent.properties file when it started by server via EC2. Actually it looks like it use the value from instance meta-data which is equal to the value set in server Web UI.

In other words I would like to have two endpoints on server:

1. For real user interacting through Cloudflare ( https://teamcity.tld -> Cloudflare Access -> Teamcity server endpoint )
2. Private endpoint for build agents ( https://teamcity-internal.tld -> Teamcity server endpoint)

It looks like I can try to place a proxy on each agent which will remap the destination for server, but perhaps there are some better solution.

Is there are a way to set the serverUrl value for build agents to a dedicated url which is different from Global server name?

Thanks!