6 files changed, 3 insertions, 33 deletions
diff --git a/roles/network/templates/NetworkManager.conf.j2 b/roles/network/templates/NetworkManager.conf.j2
index a67d2e27..43baa2f6 100644
--- a/roles/network/templates/NetworkManager.conf.j2
+++ b/roles/network/templates/NetworkManager.conf.j2
@@ -16,8 +16,6 @@ ethernet.cloned-mac-address=random
 wifi.cloned-mac-address=stable
 
 [connection]
-ipv6.ip6-privacy=2
-ipv6.dhcp-duid=stable-uuid
 wifi.powersave=2
 connection.mdns=2
 
diff --git a/roles/network/templates/bridge.nmconnection.j2 b/roles/network/templates/bridge.nmconnection.j2
index 47f723d8..8ac4c6fe 100644
--- a/roles/network/templates/bridge.nmconnection.j2
+++ b/roles/network/templates/bridge.nmconnection.j2
@@ -16,8 +16,4 @@ dns={{ network_ipv4_dns }}
 {% endif %}
 
 [ipv6]
-addr-gen-mode=default
-method=auto
-{% if network_ipv6_gateway is defined %}
-routes=::/0,{{ network_ipv6_gateway }},100
-{% endif %}
+method=disabled
diff --git a/roles/network/templates/eth0-connection.nmconnection.j2 b/roles/network/templates/eth0-connection.nmconnection.j2
index 032b18a3..f5856bce 100644
--- a/roles/network/templates/eth0-connection.nmconnection.j2
+++ b/roles/network/templates/eth0-connection.nmconnection.j2
@@ -27,14 +27,6 @@ method=auto
 {% endif %}
 
 [ipv6]
-addr-gen-mode=default
-{% if network_bridge_interface is defined or network_ipv6_disabled %}
 method=disabled
-{% elif network_ipv6_gateway is defined %}
-method=auto
-routes=::/0,{{ network_ipv6_gateway }},100
-{% else %}
-method=auto
-{% endif %}
 
 [proxy]
diff --git a/roles/network/templates/gai.conf.j2 b/roles/network/templates/gai.conf.j2
index 21c17332..8f8e29c2 100644
--- a/roles/network/templates/gai.conf.j2
+++ b/roles/network/templates/gai.conf.j2
@@ -1,10 +1,2 @@
 # Managed by Ansible — controls getaddrinfo address family preference
-{% if network_prefer_ipv4 %}
 precedence ::ffff:0:0/96  100
-{% else %}
-precedence ::1/128         50
-precedence ::/0            40
-precedence 2002::/16       30
-precedence ::/96           20
-precedence ::ffff:0:0/96   10
-{% endif %}
diff --git a/roles/network/templates/resolved.conf.j2 b/roles/network/templates/resolved.conf.j2
index 0354feeb..58336756 100644
--- a/roles/network/templates/resolved.conf.j2
+++ b/roles/network/templates/resolved.conf.j2
@@ -1,6 +1,6 @@
 [Resolve]
-DNS={{ network_ipv4_dns | default('1.1.1.1 2606:4700:4700::1111') }}
-FallbackDNS=8.8.8.8 2001:4860:4860::8888
+DNS={{ network_ipv4_dns | default('1.1.1.1') }}
+FallbackDNS=8.8.8.8
 DNSOverTLS={{ 'no' if network_ipv4_dns is defined else 'yes' }}
 DNSSEC={{ 'no' if network_ipv4_dns is defined else 'yes' }}
 # use interface-specific DNS when available but fall back to global (required for VPN DNS to work)
diff --git a/roles/network/templates/wifi-connection.nmconnection.j2 b/roles/network/templates/wifi-connection.nmconnection.j2
index 01dff2eb..b5280a30 100644
--- a/roles/network/templates/wifi-connection.nmconnection.j2
+++ b/roles/network/templates/wifi-connection.nmconnection.j2
@@ -26,14 +26,6 @@ method=auto
 {% endif %}
 
 [ipv6]
-addr-gen-mode=default
-{% if network_ipv6_disabled %}
 method=disabled
-{% elif network_ipv6_gateway is defined %}
-method=auto
-routes=::/0,{{ network_ipv6_gateway }},100
-{% else %}
-method=auto
-{% endif %}
 
 [proxy]