diff --git a/network_data.yaml b/network_data.yaml
index 68078a7c36..a6c5968cf6 100644
--- a/network_data.yaml
+++ b/network_data.yaml
@@ -22,7 +22,7 @@
 # ipv6_subnet: Optional, sets default IPv6 subnet if IPv4 is already defined.
 # ipv6_allocation_pools: Set default IPv6 allocation pools if IPv4 allocation pools
 #                        are already defined.
-# ipv6_gateway: Set an IPv6 gateway if IPv4 gateway already defined.
+# gateway_ipv6: Set an IPv6 gateway if IPv4 gateway already defined.
 # ipv6: If ip_subnet not defined, this specifies that the network is IPv6-only.
 # NOTE: IP-related values set parameter defaults in templates, may be overridden,
 # either by operators, or e.g in environments/network-isolation-v6.yaml where we
diff --git a/network_data_ganesha.yaml b/network_data_ganesha.yaml
index 7974bfb1c7..04dfcc1684 100644
--- a/network_data_ganesha.yaml
+++ b/network_data_ganesha.yaml
@@ -19,7 +19,7 @@
 # ipv6_subnet: Optional, sets default IPv6 subnet if IPv4 is already defined.
 # ipv6_allocation_pools: Set default IPv6 allocation pools if IPv4 allocation pools
 #                        are already defined.
-# ipv6_gateway: Set an IPv6 gateway if IPv4 gateway already defined.
+# gateway_ipv6: Set an IPv6 gateway if IPv4 gateway already defined.
 # ipv6: If ip_subnet not defined, this specifies that the network is IPv6-only.
 # NOTE: IP-related values set parameter defaults in templates, may be overridden,
 # either by operators, or e.g in environments/network-isolation-v6.yaml where we
diff --git a/network_data_routed.yaml b/network_data_routed.yaml
index ad63ed91dd..74959d01c3 100644
--- a/network_data_routed.yaml
+++ b/network_data_routed.yaml
@@ -29,7 +29,7 @@
 # ipv6_subnet: Optional, sets default IPv6 subnet if IPv4 is already defined.
 # ipv6_allocation_pools: Set default IPv6 allocation pools if IPv4 allocation pools
 #                        are already defined.
-# ipv6_gateway: Set an IPv6 gateway if IPv4 gateway already defined.
+# gateway_ipv6: Set an IPv6 gateway if IPv4 gateway already defined.
 # routes_ipv6: Optional, list of networks that should be routed via network gateway.
 #              Example: [{'destination':'fd00:fd00:fd00:3004::/64',
 #                         'nexthop':'fd00:fd00:fd00:3000::1'}]