diff --git a/tasks/fixes.yml b/tasks/fixes.yml
index 3bfd206..f148945 100644
--- a/tasks/fixes.yml
+++ b/tasks/fixes.yml
@@ -1,16 +1,8 @@
 ---
-- name: "fixes: {{ instance.domain }}: https://github.com/nextcloud/files_pdfviewer/issues/381"
+- name: "fixes: {{ instance.name }}: https://github.com/nextcloud/server/pull/29123"
   get_url:
-    url: https://raw.githubusercontent.com/nextcloud/files_pdfviewer/6d81ffbb65c3758bece144e0aff07b4a0ad20eef/js/files_pdfviewer-main.js
-    dest: "{{ nextcloud_install_path }}/apps/files_pdfviewer/js/files_pdfviewer-main.js"
+    url: https://raw.githubusercontent.com/nextcloud/server/240eb0258572843d76a3c3bab7a52c66afc31001/lib/private/Security/VerificationToken/CleanUpJob.php
+    dest: "{{ nextcloud_install_path }}/lib/private/Security/VerificationToken/CleanUpJob.php"
     owner: "{{ instance.user }}"
     group: "{{ instance.user }}"
-  when: (nc_installed_version.stdout|int) <= 21.0.2
-
-- name: "fixes: {{ instance.domain }}: https://github.com/nextcloud/server/pull/27015"
-  get_url:
-    url: https://raw.githubusercontent.com/nextcloud/server/553f8aff6b10bbb485ff3d3f0ec31801e2a66e51/apps/files_trashbin/lib/Storage.php
-    dest: "{{ nextcloud_install_path }}/apps/files_trashbin/lib/Storage.php"
-    owner: "{{ instance.user }}"
-    group: "{{ instance.user }}"
-  when: (nc_installed_version.stdout|int) <= 21.0.2
+  when: nc_installed_version.stdout|int is version ('22.2.0','<=')
diff --git a/tasks/main.yml b/tasks/main.yml
index 9c03daf..33585a5 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,6 @@
 ---
 - import_tasks: version.yml
+  tags: version
 - import_tasks: gateway.yml
 - import_tasks: database.yml
 - import_tasks: php.yml
@@ -12,3 +13,4 @@
 - import_tasks: nextcloud_configuration.yml
   tags: configuration
 - import_tasks: fixes.yml
+  tags: fixes
diff --git a/tasks/version.yml b/tasks/version.yml
index 36a4158..c24a6ff 100644
--- a/tasks/version.yml
+++ b/tasks/version.yml
@@ -7,7 +7,7 @@
 
 - name: "version: {{ instance.domain }}: Prüfe NC-Version"
   shell:
-    cmd: ./occ -V | cut -d ' ' -f2
+    cmd: php ./occ -V | awk '{print $NF}'
     chdir: "{{ nextcloud_install_path }}"
   become: true
   become_user: "{{ instance.user }}"