diff --git a/roles/nginx/tasks/only_nginx.yml b/roles/nginx/tasks/only_nginx.yml
index 127c357b8..cf343bae5 100644
--- a/roles/nginx/tasks/only_nginx.yml
+++ b/roles/nginx/tasks/only_nginx.yml
@@ -3,130 +3,121 @@
     path: /etc/apache2/sites-enabled/awstats.conf
     state: absent
 
-- name: Install nginx support for awstats if awstats_enabled
-  copy:
-    backup: no
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-    mode: "{{ item.mode }}"
-    owner: root
-    group: root
-  with_items:
-    - { src: 'roles/awstats/templates/awstats-nginx.conf', dest: '/etc/nginx/conf.d/kiwix-nginx.conf' , mode: '0644' }
-  when: awstats_enabled
+- name: Install /etc/nginx/conf.d/awstats-nginx.conf from template, if awstats_enabled
+  template:
+    src: roles/awstats/templates/awstats-nginx.conf
+    dest: /etc/nginx/conf.d/awstats-nginx.conf
+    owner: root    # Not nec? Remove?
+    group: root    # Not nec? Remove?
+    mode: '0644'    # Not nec? Remove?
+  when: awstats_enabled | bool
 
-- name: Remove nginx support for AWStats
+- name: Remove NGINX support for AWStats, if not awstats_enabled
   file:
     path: /etc/nginx/conf.d/awstats-nginx.conf
     state: absent
   when: not awstats_enabled
 
+
 - name: Remove symlink /etc/apache2/sites-enabled/kiwix.conf
   file:
     path: /etc/apache2/sites-enabled/kiwix.conf
     state: absent
 
-- name: Install nginx support for kiwix if kiwix_enabled
-  copy:
-    backup: no
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-    mode: "{{ item.mode }}"
-    owner: root
-    group: root
-  with_items:
-    - { src: 'roles/kiwix/templates/kiwix-nginx.conf', dest: '/etc/nginx/conf.d/kiwix-nginx.conf' , mode: '0644' }
+- name: Install /etc/nginx/conf.d/kiwix-nginx.conf from template, if kiwix_enabled
+  template:
+    src: roles/kiwix/templates/kiwix-nginx.conf
+    dest: /etc/nginx/conf.d/kiwix-nginx.conf
+    owner: root    # Not nec? Remove?
+    group: root    # Not nec? Remove?
+    mode: '0644'    # Not nec? Remove?
   when: kiwix_enabled | bool
 
-- name: Remove nginx support for kiwix
+- name: Remove NGINX support for Kiwix, if not kiwix_enabled
   file:
     path: /etc/nginx/conf.d/kiwix-nginx.conf
     state: absent
-  when: not kiwix_enabled | bool
+  when: not kiwix_enabled
+
 
 - name: Remove symlink /etc/apache2/sites-enabled/sugarizer.conf
   file:
     path: /etc/apache2/sites-enabled/sugarizer.conf
     state: absent
 
-- name: "Install sugarizer-nginx.conf (nginx) if sugarizer_enabled"
+- name: Install /etc/nginx/conf.d/sugarizer-nginx.conf from template, if sugarizer_enabled
   template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-    mode: "{{ item.mode }}"
-    owner: root
-    group: root
-  with_items:
-    - { src: 'roles/sugarizer/templates/sugarizer-nginx.conf', dest: '/etc/nginx/conf.d/sugarizer-nginx.conf', mode: '0644' }
+    src: roles/sugarizer/templates/sugarizer-nginx.conf
+    dest: /etc/nginx/conf.d/sugarizer-nginx.conf
+    owner: root    # Not nec? Remove?
+    group: root    # Not nec? Remove?
+    mode: '0644'    # Not nec? Remove?
   when: sugarizer_enabled | bool
 
-- name: Remove nginx support for sugarizer
+- name: Remove NGINX support for Sugarizer, if not sugarizer_enabled
   file:
     path: /etc/nginx/conf.d/sugarizer-nginx.conf
     state: absent
-  when: not sugarizer_enabled | bool
+  when: not sugarizer_enabled
 
-- name: Remove /etc/apache2/sites-enabled/kolibri.conf
+
+- name: Remove symlink /etc/apache2/sites-enabled/kolibri.conf
   file:
     path: /etc/apache2/sites-enabled/kolibri.conf
     state: absent
 
-- name: Supply /etc/nginx/conf.d/kolibri-nginx.conf when kolibri_enabled
+- name: Install /etc/nginx/conf.d/kolibri-nginx.conf from template, if kolibri_enabled
   template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-    mode: "{{ item.mode }}"
-    owner: root
-    group: root
-  with_items:
-    - { src: 'roles/kolibri/templates/kolibri-nginx.conf.j2', dest: '/etc/nginx/conf.d/kolibri-nginx.conf', mode: '0644' }
+    src: roles/kolibri/templates/kolibri-nginx.conf.j2
+    dest: /etc/nginx/conf.d/kolibri-nginx.conf
+    owner: root    # Not nec? Remove?
+    group: root    # Not nec? Remove?
+    mode: '0644'    # Not nec? Remove?
   when: kolibri_enabled | bool
 
-- name: Remove nginx support for kolibri when not kolibri_enabled
+- name: Remove NGINX support for Kolibri, if not kolibri_enabled
   file:
     path: /etc/nginx/conf.d/kolibri-nginx.conf
     state: absent
-  when: not kolibri_enabled | bool
+  when: not kolibri_enabled
+
 
 - name: Remove symlink /etc/apache2/sites-enabled/calibre-web.conf
   file:
     path: /etc/apache2/sites-enabled/calibre-web.conf
     state: absent
 
-- name: Install /etc/nginx/conf.d/calibre-web-nginx.conf
+- name: Install /etc/nginx/conf.d/calibre-web-nginx.conf from template, if calibreweb_enabled
   template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-    owner: root
-    group: root
-    mode: "{{ item.mode }}"
-  with_items:
-    - { src: 'roles/calibre-web/templates/calibre-web-nginx.conf.j2', dest: '/etc/nginx/conf.d/calibre-web-nginx.conf', mode: '0644' }
-  when: calibreweb_enabled
+    src: roles/calibre-web/templates/calibre-web-nginx.conf.j2
+    dest: /etc/nginx/conf.d/calibre-web-nginx.conf
+    owner: root    # Not nec? Remove?
+    group: root    # Not nec? Remove?
+    mode: '0644'    # Not nec? Remove?
+  when: calibreweb_enabled | bool
 
-- name: Remove nginx support for Calibre-Web
+- name: Remove NGINX support for Calibre-Web, if not calibreweb_enabled
   file:
     path: /etc/nginx/conf.d/calibre-web-nginx.conf
     state: absent
   when: not calibreweb_enabled
 
+
 - name: Remove symlink /etc/apache2/sites-enabled/gitea.conf
   file:
     path: /etc/apache2/sites-enabled/gitea.conf
     state: absent
 
-- name: Install /etc/nginx/conf.d/gitea-nginx.conf
+- name: Install /etc/nginx/conf.d/gitea-nginx.conf from template, if gitea_enabled
   template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-    owner: root
-    group: root
-    mode: "{{ item.mode }}"
-  with_items:
-    - { src: 'roles/gitea/templates/gitea-nginx.conf.j2', dest: '/etc/nginx/conf.d/gitea-nginx.conf', mode: '0644' }
-  when: gitea_enabled
+    src: roles/gitea/templates/gitea-nginx.conf.j2
+    dest: /etc/nginx/conf.d/gitea-nginx.conf
+    owner: root    # Not nec? Remove?
+    group: root    # Not nec? Remove?
+    mode: '0644'    # Not nec? Remove?
+  when: gitea_enabled | bool
 
-- name: Remove nginx support for Gitea
+- name: Remove NGINX support for Gitea, if not gitea_enabled
   file:
     path: /etc/nginx/conf.d/gitea-nginx.conf
     state: absent