diff --git a/roles/nginx/tasks/only_nginx.yml b/roles/nginx/tasks/only_nginx.yml
index cf343bae5..63583f74d 100644
--- a/roles/nginx/tasks/only_nginx.yml
+++ b/roles/nginx/tasks/only_nginx.yml
@@ -19,69 +19,6 @@
   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 /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, if not kiwix_enabled
-  file:
-    path: /etc/nginx/conf.d/kiwix-nginx.conf
-    state: absent
-  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 /etc/nginx/conf.d/sugarizer-nginx.conf from template, if sugarizer_enabled
-  template:
-    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, if not sugarizer_enabled
-  file:
-    path: /etc/nginx/conf.d/sugarizer-nginx.conf
-    state: absent
-  when: not sugarizer_enabled
-
-
-- name: Remove symlink /etc/apache2/sites-enabled/kolibri.conf
-  file:
-    path: /etc/apache2/sites-enabled/kolibri.conf
-    state: absent
-
-- name: Install /etc/nginx/conf.d/kolibri-nginx.conf from template, if kolibri_enabled
-  template:
-    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, if not kolibri_enabled
-  file:
-    path: /etc/nginx/conf.d/kolibri-nginx.conf
-    state: absent
-  when: not kolibri_enabled
-
-
 - name: Remove symlink /etc/apache2/sites-enabled/calibre-web.conf
   file:
     path: /etc/apache2/sites-enabled/calibre-web.conf
@@ -122,3 +59,66 @@
     path: /etc/nginx/conf.d/gitea-nginx.conf
     state: absent
   when: not gitea_enabled
+
+
+- name: Remove symlink /etc/apache2/sites-enabled/kiwix.conf
+  file:
+    path: /etc/apache2/sites-enabled/kiwix.conf
+    state: absent
+
+- 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, if not kiwix_enabled
+  file:
+    path: /etc/nginx/conf.d/kiwix-nginx.conf
+    state: absent
+  when: not kiwix_enabled
+
+
+- name: Remove symlink /etc/apache2/sites-enabled/kolibri.conf
+  file:
+    path: /etc/apache2/sites-enabled/kolibri.conf
+    state: absent
+
+- name: Install /etc/nginx/conf.d/kolibri-nginx.conf from template, if kolibri_enabled
+  template:
+    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, if not kolibri_enabled
+  file:
+    path: /etc/nginx/conf.d/kolibri-nginx.conf
+    state: absent
+  when: not kolibri_enabled
+
+
+- name: Remove symlink /etc/apache2/sites-enabled/sugarizer.conf
+  file:
+    path: /etc/apache2/sites-enabled/sugarizer.conf
+    state: absent
+
+- name: Install /etc/nginx/conf.d/sugarizer-nginx.conf from template, if sugarizer_enabled
+  template:
+    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, if not sugarizer_enabled
+  file:
+    path: /etc/nginx/conf.d/sugarizer-nginx.conf
+    state: absent
+  when: not sugarizer_enabled