diff --git a/tasks/main.yml b/tasks/main.yml
index 83939dc..00e4975 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -56,15 +56,31 @@
     value: '{{ vm_swappiness }}'
     state: present
 
-- name: Disable Default IPV6
-  become: yes
-  shell: "sysctl -w net.ipv6.conf.default.disable_ipv6=1"
-  tags: ['ipv6']
+#- name: Disable Default IPV6
+#  become: yes
+#  shell: "sysctl -w net.ipv6.conf.default.disable_ipv6=1"
+#  tags: ['ipv6']
+
+#- name: Disable All IPV6
+#  become: yes
+#  shell: "sysctl -w net.ipv6.conf.all.disable_ipv6=1"
+#  tags: ['ipv6']
 
 - name: Disable All IPV6
-  become: yes
-  shell: "sysctl -w net.ipv6.conf.all.disable_ipv6=1"
   tags: ['ipv6']
+  sysctl:
+    name: net.ipv6.conf.all.disable_ipv6
+    value: 1
+    state: present
+    sysctl_set: yes
+
+- name: Disable All IPV6
+  tags: ['ipv6']
+  sysctl:
+    name: net.ipv6.conf.default.disable_ipv6
+    value: 1
+    state: present
+    sysctl_set: yes
 
 - name: Update for apigee installation environment
   become: yes