diff --git a/roles/captive-portal/tasks/main.yml b/roles/captive-portal/tasks/main.yml
index 80d97b5ba..514ba64e5 100644
--- a/roles/captive-portal/tasks/main.yml
+++ b/roles/captive-portal/tasks/main.yml
@@ -6,20 +6,16 @@
     - python-dateutil
     - sqlite3    # @georgehunt hopes to move this to 2-common (or more like stage 3-base-server, alongside MySQL) in October 2018
 
-- name: Install wsgi (debuntu)
+- name: Install libapache2-mod-wsgi (debuntu)
   package:
-    name: "{{ item }}"
+    name: libapache2-mod-wsgi
     state: present
-  with_items:
-    - libapache2-mod-wsgi
   when: is_debuntu
 
-- name: Install wsgi (not debuntu)
+- name: Install mod_wsgi (not debuntu)
   package:
-    name: "{{ item }}"
+    name: mod_wsgi
     state: present
-  with_items:
-    - mod_wsgi
   when: not is_debuntu
 
 - name: Create directory /opt/iiab/captive-portal for scripts & templates
@@ -125,8 +121,8 @@
 
 - name: Restart apache2
   systemd: 
-     name: apache2
-     state: restarted
+    name: apache2
+    state: restarted
 
 - name: Restart dnsmasq
   systemd: 
diff --git a/roles/captive-portal/templates/captive-portal.service.j2 b/roles/captive-portal/templates/captive-portal.service.j2.deprecated
similarity index 100%
rename from roles/captive-portal/templates/captive-portal.service.j2
rename to roles/captive-portal/templates/captive-portal.service.j2.deprecated