diff --git a/roles/network/tasks/captive_portal.yml b/roles/network/tasks/captive_portal.yml
index cb37e7783..bd34a54df 100644
--- a/roles/network/tasks/captive_portal.yml
+++ b/roles/network/tasks/captive_portal.yml
@@ -51,8 +51,8 @@
      
 - name: Copy Captive Portal service file
   template:
-    src: roles/network/templates/captive-portal/captive-portal.service.j2
-    dest: /etc/systemd/system/captive-portal.service
+    src: roles/network/templates/captive-portal/py-captive-portal.service.j2
+    dest: /etc/systemd/system/py-captive-portal.service
     owner: root
     group: root
     mode: 0644
@@ -69,7 +69,7 @@
 
 - name: Enable captive-portal after copying files
   systemd:
-    name: captive-portal.service
+    name: py-captive-portal.service
     enabled: yes
     daemon-reload: yes
   when: py_captive_portal_install and py_captive_portal_enabled
@@ -90,20 +90,20 @@
 
 - name: Start captive-portal after copying files
   systemd:
-    name: captive-portal.service
+    name: py-captive-portal.service
     state: started
   when: py_captive_portal_install and py_captive_portal_enabled
 
 - name: Disable captive-portal after copying files
   systemd:
-    name: captive-portal.service
+    name: py-captive-portal.service
     enabled: no
     daemon-reload: yes
   when: py_captive_portal_install and not py_captive_portal_enabled
 
 - name: Stop captive-portal after copying files
   service:
-    name: captive-portal.service
+    name: py-captive-portal.service
     state: stopped
   when: py_captive_portal_install and not py_captive_portal_enabled
 
diff --git a/roles/network/templates/captive-portal/captive-portal.service.j2 b/roles/network/templates/captive-portal/py-captive-portal.service.j2
similarity index 100%
rename from roles/network/templates/captive-portal/captive-portal.service.j2
rename to roles/network/templates/captive-portal/py-captive-portal.service.j2
diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index ac666d5a3..e1d31859d 100644
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@@ -108,7 +108,7 @@ block_DNS: False
 
 # dnsmasq
 dnsmasq_install: True
-dnsmasq_enabled: False
+dnsmasq_enabled: True
 
 # Enable in local_vars.yml AFTER installing IIAB!  Then run "cd /opt/iiab/iiab; ./iiab-network"
 dns_jail_enabled: False
@@ -119,7 +119,7 @@ captive_portal_enabled: False
 
 # Simple python Captive Portal, that @m-anish & @jvonau are experimenting with in July 2018: github.com/iiab/iiab/pull/870
 py_captive_portal_install: True
-py_captive_portal_enabled: False
+py_captive_portal_enabled: True
 
 # Squid
 squid_install: False