Replication distribution database in Always On availability group

Hi,  Configured distributor  in Availability Group, there are 2 replicas for distributor server,configured listener name. When I create a publication , snapshot agent is created with Primary Replica Instance name in the Snapshot Agent Job step 2, however Log reader agent job is getting created with Distributor Listener name in the Log Reader Agent Job Step 2. 

How can I force the snapshot agent to use listener name instead of using Instance name of the primary replica. 

This is how snapshot agent is getting created, which will not work once I fail-over the distributor, since primary role will change, I want Listener name in the Distributor Parameter.

-Publisher [Publisher/InstanceName] -PublisherDB [Data] -Distributor [DISTRIBUTOR/InstanceName] -Publication [TestPub] -DistributorSecurityMode 1

Even If I change the Distributor to Listener Name, I am losing those changes once I fail-over the distributor.

Please advise any ideas on how I can fix this.

Thanks