diff --git a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap
index c629195ee..b4f9dc50c 100644
--- a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap
+++ b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap
@@ -4314,8 +4314,8 @@ notifyOrgsAboutChannels() {
   printHeadline "Notyfing orgs about channels" "U1F4E2"
   notifyOrgAboutNewChannelTls "my-channel1" "Org1MSP" "cli.org1.example.com" "peer0.org1.example.com" "orderer0.group1.orderer1.com:7030" "crypto-orderer/tlsca.orderer1.com-cert.pem"
   notifyOrgAboutNewChannelTls "my-channel1" "Org2MSP" "cli.org2.example.com" "peer0.org2.example.com" "orderer0.group1.orderer1.com:7030" "crypto-orderer/tlsca.orderer1.com-cert.pem"
-  notifyOrgAboutNewChannelTls "my-channel2" "Org1MSP" "cli.org1.example.com" "peer0.org1.example.com" "orderer0.group1.orderer1.com:7030" "crypto-orderer/tlsca.orderer1.com-cert.pem"
-  notifyOrgAboutNewChannelTls "my-channel2" "Org2MSP" "cli.org2.example.com" "peer0.org2.example.com" "orderer0.group1.orderer1.com:7030" "crypto-orderer/tlsca.orderer1.com-cert.pem"
+  notifyOrgAboutNewChannelTls "my-channel2" "Org1MSP" "cli.org1.example.com" "peer1.org1.example.com" "orderer0.group1.orderer1.com:7030" "crypto-orderer/tlsca.orderer1.com-cert.pem"
+  notifyOrgAboutNewChannelTls "my-channel2" "Org2MSP" "cli.org2.example.com" "peer1.org2.example.com" "orderer0.group1.orderer1.com:7030" "crypto-orderer/tlsca.orderer1.com-cert.pem"
   notifyOrgAboutNewChannelTls "my-channel3" "Org1MSP" "cli.org1.example.com" "peer0.org1.example.com" "orderer0.group2.orderer2.com:7050" "crypto-orderer/tlsca.orderer2.com-cert.pem"
   notifyOrgAboutNewChannelTls "my-channel3" "Org2MSP" "cli.org2.example.com" "peer0.org2.example.com" "orderer0.group2.orderer2.com:7050" "crypto-orderer/tlsca.orderer2.com-cert.pem"
 
diff --git a/src/setup-docker/templates/fabric-docker/commands-generated.sh b/src/setup-docker/templates/fabric-docker/commands-generated.sh
index f556017f3..ef2f17d1a 100644
--- a/src/setup-docker/templates/fabric-docker/commands-generated.sh
+++ b/src/setup-docker/templates/fabric-docker/commands-generated.sh
@@ -216,14 +216,14 @@ notifyOrgsAboutChannels() {
          "<%= channel.name %>" <% -%>
          "<%= org.mspName %>" <% -%>
          "<%= org.cli.address %>" <% -%>
-         "peer0.<%= org.domain %>" <% -%>
+         "<%= org.headPeer.address %>" <% -%>
          "<%= channel.ordererHead.fullAddress %>"
       <% } else { -%>
         notifyOrgAboutNewChannelTls <% -%>
          "<%= channel.name %>" <% -%>
          "<%= org.mspName %>" <% -%>
          "<%= org.cli.address %>" <% -%>
-         "peer0.<%= org.domain %>" <% -%>
+         "<%= org.headPeer.address %>" <% -%>
          "<%= channel.ordererHead.fullAddress %>" <% -%>
          "crypto-orderer/tlsca.<%= channel.ordererHead.domain %>-cert.pem"
       <% } -%>