diff --git a/roles/network/tasks/dnsmasq.yml b/roles/network/tasks/dnsmasq.yml
index 0f7c4128b..2d7d53e19 100644
--- a/roles/network/tasks/dnsmasq.yml
+++ b/roles/network/tasks/dnsmasq.yml
@@ -1,24 +1,27 @@
 - name: Install dnsmasq
-  package: name=dnsmasq state=present
-
-- name: Stop dnsmasq
-  service:
+  package:
     name: dnsmasq
-    state: stopped
+    state: present
 
-- name: Configure dhcpd
-  template: src={{ item.src }}
-            dest={{ item.dest }}
-            owner=root
-            group=root
-            mode={{ item.mode }}
-  with_items:
-#   - { src: 'network/dnsmasq.service.rh', dest: '/etc/systemd/system/dnsmasq.service', mode: '0644' }
-   - { src: 'network/dnsmasq.conf.j2' dest: '/etc/dnsmasq.conf' mode: '644' }
+#- name: Stop dnsmasq
+#  service:
+#    name: dnsmasq
+#    state: stopped
 
-- name: Start dnsmasq
-  systemd:
-    name: dnsmasq
-    state: restarted
-    enabled: yes
-    daemon_reload: yes
+#- name: Configure dnsmasq
+#  template:
+#    src: "{{ item.src }}"
+#    dest: "{{ item.dest }}"
+#    owner: root
+#    group: root
+#    mode: "{{ item.mode }}"
+#  with_items:
+##   - { src: 'network/dnsmasq.service.rh', dest: '/etc/systemd/system/dnsmasq.service', mode: '0644' }
+#   - { src: 'roles/network/templates/network/dnsmasq.conf.j2', dest: '/etc/dnsmasq.conf', mode: '644' }
+
+#- name: Start dnsmasq
+#  systemd:
+#    name: dnsmasq
+#    state: restarted
+#    enabled: yes
+#    daemon_reload: yes
diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index c02f7254c..4521aa174 100644
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@@ -104,6 +104,14 @@ named_install: True
 named_enabled: True
 block_DNS: False
 
+# dnsmasq
+dnsmasq_install: False
+dnsmasq_enabled: False
+
+# Captive Portal highly experimental as of June 2018: https://github.com/iiab/iiab/issues/608
+captive_portal_install: False
+captive_portal_enabled: False
+
 # Squid
 squid_install: False
 squid_enabled: False