diff --git a/playbooks/maintenance.yaml b/playbooks/maintenance.yaml
index 31c817b..8b6d037 100644
--- a/playbooks/maintenance.yaml
+++ b/playbooks/maintenance.yaml
@@ -1,30 +1,10 @@
-- name: Ensure NGINX repo and install on nginx_hosts
-  hosts: nginx_hosts
+- name: Ensure nginx install on nginx_hosts and nextcloud_hosts
+  hosts: nginx_hosts:nextcloud_hosts
   tasks:
-    - name: make sure NGINX repos are setup
+    - name: Ensure NGINX is installed
       ansible.builtin.include_role:
         name: nginx
-        tasks_from: main/repo_setup
-
-    - name: make sure NGINX is installed
-      ansible.builtin.include_role:
-        name: nginx
-        tasks_from: main/nginx_install
-
-- name: Ensure NGINX repo and install on nextcloud_hosts
-  hosts: nextcloud_hosts:!nginx_hosts
-  tasks:
-    - name: make sure NGINX repos are setup
-      ansible.builtin.include_role:
-        name: nginx
-        tasks_from: main/repo_setup
-
-    - name: make sure NGINX is installed
-      ansible.builtin.include_role:
-        name: nginx
-        tasks_from: main/nginx_install
-      vars:
-        nginx__version_spec: "{{ nextcloud__nginx_version_spec | default('') }}"
+        tasks_from: main/02_nginx_install.yaml
 
 - name: Make Sure System Package Are Up-To-Date for all non-hypervisors
   hosts: all:!hypervisors