diff --git a/resources/custom-properties.yml b/resources/custom-properties.yml
index 36ead4c..3688ba9 100644
--- a/resources/custom-properties.yml
+++ b/resources/custom-properties.yml
@@ -152,11 +152,13 @@
 # OS Config for all Nodes
 sysctl_minimum:
 - { name: 'vm.swappiness', value: "{{ vm_swappiness }}" }
-- { name: 'net.ipv6.conf.all.disable_ipv6', value: '1' }
-- { name: 'net.ipv6.conf.default.disable_ipv6', value: '1' }
 - { name: 'net.ipv4.tcp_fin_timeout', value: "{{ apigee_net_ipv4_tcp_fin_timeout }}" }
 - { name: 'vm.max_map_count', value: '{{ apigee_max_map_count }}' }
 
+sysctl_ipv6:
+- { name: 'net.ipv6.conf.all.disable_ipv6', value: '1' }
+- { name: 'net.ipv6.conf.default.disable_ipv6', value: '1' }
+
 # OS Config for Postgres
 apigee_kernel_sem: '500 32000 32 1024'
 sysctl_pg: