diff --git a/bundles/wireguard/metadata.py b/bundles/wireguard/metadata.py
index 19e324a..f0600c3 100644
--- a/bundles/wireguard/metadata.py
+++ b/bundles/wireguard/metadata.py
@@ -175,11 +175,13 @@ def peer_endpoints(metadata):
         except NoSuchNode:
             continue
 
+        if repo.libs.s2s.WG_AUTOGEN_SETTINGS.get(name, {}).get('no_autoconnect'):
+            continue
 
         peers[rnode.name] = {
             'endpoint': '{}:{}'.format(
-                rnode.metadata.get('wireguard/external_hostname', rnode.hostname),
-                rnode.metadata.get(f'wireguard/peers/{node.name}/my_port', 51820),
+                rnode.hostname,
+                rnode.metadata.get(f'wireguard/peers/{node.name}/my_port'),
             ),
         }
 
diff --git a/libs/s2s.py b/libs/s2s.py
index 0da6d41..eba4728 100644
--- a/libs/s2s.py
+++ b/libs/s2s.py
@@ -23,6 +23,7 @@ WG_AUTOGEN_NODES = [
 WG_AUTOGEN_SETTINGS = {
     # special settings to apply when peering with a specific node
     'home.router': {
+        'no_autoconnect': True,
         'persistent_keepalive': False,
     },
 }