diff --git a/files/yggdrasil/config.conf b/files/yggdrasil/config.conf
index 62504b3..e7b69c6 100644
--- a/files/yggdrasil/config.conf
+++ b/files/yggdrasil/config.conf
@@ -6,11 +6,18 @@
     # use this section when you may connect via different interfaces.
 
     Peers: [
-        #TRUSTED PEERS - Waren Group
-        #aurora.devices.waren.io
-        #201:361f:bbfb:7210:c5b8:3f74:a285:adb9
-        "tls://[2a01:4f9:2a:60c::2]:18836",
-        "tls://95.216.5.243:18836",
+{% if config.yggdrasil.peers is defined %}
+        #TRUSTED PEERS
+{% for peer in config.yggdrasil.peers %}
+{% if peer.name is defined and peer.address is defined and peer.address.ipv4 is defined and peer.address.ipv6 is defined %}
+
+        #{{ peer.name }}
+        "{{ peer.address }}"{% if not loop.last %},{% endif %}
+{% endif %}
+{% endif %}
+{% endfor %}
+{% endif %}
+
     ]
 
     # List of connection strings for static peers in URI format, arranged