diff --git a/bundles/wireguard/metadata.py b/bundles/wireguard/metadata.py
index 9f8e28c..561dfd2 100644
--- a/bundles/wireguard/metadata.py
+++ b/bundles/wireguard/metadata.py
@@ -117,7 +117,7 @@ def peer_ips_and_ports(metadata):
 
         peers[rnode.name] = {
             'my_ip': str(my_ip),
-            'my_port': base_port + number,
+            'my_port': base_port + repo.libs.s2s.WG_AUTOGEN_NODES.index(rnode.name),
             'their_ip': str(their_ip)
         }