diff --git a/roles/vpn/tasks/iptables.yml b/roles/vpn/tasks/iptables.yml
index 0088a6d..fc065c3 100644
--- a/roles/vpn/tasks/iptables.yml
+++ b/roles/vpn/tasks/iptables.yml
@@ -9,7 +9,7 @@
 
 - name: Iptables configured
   template: src="{{ item.src }}" dest="{{ item.dest }}" owner=root group=root mode=0640
-  when: ipv6_support is defined and ipv6_support == "yes"
+  when: ipv6_support is defined and ipv6_support == true
   with_items:
     - { src: rules.v6.j2, dest: /etc/iptables/rules.v6 }
   notify:
diff --git a/roles/vpn/tasks/main.yml b/roles/vpn/tasks/main.yml
index f98b4c6..9aec604 100644
--- a/roles/vpn/tasks/main.yml
+++ b/roles/vpn/tasks/main.yml
@@ -1,6 +1,11 @@
 - name: Gather Facts
   setup:
 
+- name: Enable IPv6
+  set_fact:
+    ipv6_support: true
+  when: ansible_default_ipv6.gateway is defined
+
 - name: Generate password for the CA key
   shell: >
     < /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-12};echo;