diff --git a/roles/4-server-options/tasks/main.yml b/roles/4-server-options/tasks/main.yml
index fcdaf3fe7..49b749a31 100644
--- a/roles/4-server-options/tasks/main.yml
+++ b/roles/4-server-options/tasks/main.yml
@@ -5,12 +5,6 @@
     path: "{{ iiab_state_file }}"
     state: touch
 
-- name: NGINX
-  include_role:
-    name: nginx
-  when: nginx_install
-  tags: base, nginx
-
 - name: Install dnsmasq
   include_tasks: roles/network/tasks/dnsmasq.yml
   when: dnsmasq_install | bool
diff --git a/roles/9-local-addons/tasks/main.yml b/roles/9-local-addons/tasks/main.yml
index dacbd7e6e..63e587c6c 100644
--- a/roles/9-local-addons/tasks/main.yml
+++ b/roles/9-local-addons/tasks/main.yml
@@ -43,6 +43,12 @@
     name: calibre-web
   tags: calibre-web
 
+- name: NGINX
+  include_role:
+    name: nginx
+  when: nginx_install
+  tags: base, nginx
+
 - name: Recording STAGE 9 HAS COMPLETED ====================
   lineinfile:
     dest: "{{ iiab_env_file }}"