diff --git a/roles/nginx/tasks/uses_apache.yml b/roles/nginx/tasks/uses_apache.yml
index 91bf27e4a..d35a150bb 100644
--- a/roles/nginx/tasks/uses_apache.yml
+++ b/roles/nginx/tasks/uses_apache.yml
@@ -1,29 +1,29 @@
-- name: Install nginx's config file from template, if moodle_enabled
+- name: Install /etc/nginx/conf.d/moodle-nginx.conf from template, if moodle_enabled
   template:
     src: moodle-nginx.conf.j2
-    dest: "/etc/nginx/conf.d/moodle-nginx.conf"
-    owner: root
-    group: root
-    mode: 0644
-  when: moodle_enabled
+    dest: /etc/nginx/conf.d/moodle-nginx.conf
+    owner: root    # Not nec? Remove?
+    group: root    # Not nec? Remove?
+    mode: '0644'    # Not nec? Remove?
+  when: moodle_enabled | bool
 
-- name: Install /etc/nginx/conf.d/dokuwiki-nginx.conf from template
+- name: Install /etc/nginx/conf.d/dokuwiki-nginx.conf from template, if dokuwiki_enabled
   template:
     src: dokuwiki-nginx.conf
     dest: /etc/nginx/conf.d/dokuwiki-nginx.conf
-  when: dokuwiki_enabled
+  when: dokuwiki_enabled | bool
 
-- name: Install /etc/nginx/conf.d/elgg-nginx.conf from template
+- name: Install /etc/nginx/conf.d/elgg-nginx.conf from template, if elgg_enabled
   template:
     src: elgg-nginx.conf
-    dest: "/etc/nginx/conf.d/elgg-nginx.conf"
-  when: elgg_enabled
+    dest: /etc/nginx/conf.d/elgg-nginx.conf
+  when: elgg_enabled | bool
 
-- name: Install /etc/nginx/lokole-nginx.conf from template
+- name: Install /etc/nginx/conf.d/lokole-nginx.conf from template, if lokole_enabled
   template:
     src: lokole-nginx.conf.j2
-    dest: "/etc/nginx/conf.d/lokole-nginx.conf"
-  when: lokole_enabled
+    dest: /etc/nginx/conf.d/lokole-nginx.conf
+  when: lokole_enabled | bool
 
 # mediawiki and wordpress are no longer proxied
 
@@ -39,20 +39,19 @@
 #      dest: /etc/nginx/conf.d/
 #  when: wordpress_enabled
 
-- name: Install Nextcloud's nginx conf.d file from template
+- name: Install /etc/nginx/conf.d/nextcloud-nginx.conf from template, if nextcloud_enabled
   template:
-       src: nextcloud-nginx.conf
-       dest: /etc/nginx/conf.d/nextcloud-nginx.conf
-  when: nextcloud_enabled
+    src: nextcloud-nginx.conf
+    dest: /etc/nginx/conf.d/nextcloud-nginx.conf
+  when: nextcloud_enabled | bool
 
-- name: Install NodeRed's nginx conf.d file from template
+- name: Install /etc/nginx/conf.d/nodered-nginx.conf from template, if nodered_enabled
   template:
     src: nodered-nginx.conf.j2
     dest: /etc/nginx/conf.d/nodered-nginx.conf
-    owner: root
-    group: root
-    mode: 0666
-  when: nodered_enabled
+    owner: root    # Not nec? Remove?
+    group: root    # Not nec? Remove?
+    mode: '0666'
+  when: nodered_enabled | bool
 
 #- name: Install proxpass to apache running on localhost
-