diff --git a/tasks/install.yml b/tasks/install.yml
index 846ffe8a1c6e37f069bf22fcdfa39b3c8e4963e8..101ba7e7369fde6823167e106fe7d8e96c428da8 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -222,48 +222,45 @@
     - nextcloud
     - rainloop
 
-- block:
-
-    - name: Enable Plugins
-      command: '{{ webRoot }}/occ app:enable {{ item.id }} --no-interaction --no-warnings'
-      become_user: '{{ apacheUser }}'
-      ignore_errors: yes
-      with_items: '{{ nextcloud_plugins_public }}'
-      when: item.latest_release.version != plugin_versions[item.id]|default('0.0.0')
-      tags:
-        - deploy
-        - plugins
-
-    - name: Run Upgrade
-      command: '{{ webRoot }}/occ upgrade --no-interaction --no-warnings'
-      become_user: '{{ apacheUser }}'
-      ignore_errors: yes
-      tags:
-        - deploy
-        - plugins
+- name: Enable Plugins
+  command: '{{ webRoot }}/occ app:enable {{ item.id }} --no-interaction --no-warnings'
+  become_user: '{{ apacheUser }}'
+  ignore_errors: yes
+  with_items: '{{ nextcloud_plugins_public }}'
+  when: installed and item.latest_release.version != plugin_versions[item.id]|default('0.0.0')
+  tags:
+    - deploy
+    - plugins
 
-    - name: Enable Plugins
-      command: '{{ webRoot }}/occ app:enable {{ item.id }} --no-interaction --no-warnings'
-      become_user: '{{ apacheUser }}'
-      ignore_errors: yes
-      with_items: '{{ nextcloud_plugins_public }}'
-      when: item.latest_release.version != plugin_versions[item.id]|default('0.0.0')
-      tags:
-        - deploy
-        - plugins
+- name: Disable Maintenance Mode
+  command: '{{ webRoot }}/occ maintenance:mode --off --no-interaction --no-warnings'
+  become_user: '{{ apacheUser }}'
+  ignore_errors: yes
+  tags:
+    - deploy
+    - plugins
 
+- name: Run Upgrade
+  command: '{{ webRoot }}/occ upgrade --no-interaction --no-warnings'
+  become_user: '{{ apacheUser }}'
+  ignore_errors: yes
   when: installed
-
-- name: Configure Spreed
-  include_tasks: spreed.yml
-  when: nextcloud.spreed is defined
   tags:
     - deploy
+    - plugins
 
-- name: Disable Maintenance Mode
-  command: '{{ webRoot }}/occ maintenance:mode --off --no-interaction --no-warnings'
+- name: Enable Plugins
+  command: '{{ webRoot }}/occ app:enable {{ item.id }} --no-interaction --no-warnings'
   become_user: '{{ apacheUser }}'
   ignore_errors: yes
+  with_items: '{{ nextcloud_plugins_public }}'
+  when: installed and item.latest_release.version != plugin_versions[item.id]|default('0.0.0')
   tags:
     - deploy
     - plugins
+
+- name: Configure Spreed
+  include_tasks: spreed.yml
+  when: nextcloud.spreed is defined
+  tags:
+    - deploy