diff --git a/tasks/access.yml b/tasks/access.yml
index c82f292..aed46d8 100644
--- a/tasks/access.yml
+++ b/tasks/access.yml
@@ -59,4 +59,3 @@
     state: file
     owner: www-data
     group: www-data
-    state: touch
diff --git a/tasks/main.yml b/tasks/main.yml
index 992a382..3b3089a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -25,6 +25,11 @@
   when: nextcloud_database_type == "mysql"
 
 - import_tasks: core.yml
+  when:
+    - nextcloud_state == "reinstalled" or
+      (nextcloud_state == "installed" and not _nextcloud_version_file_stat.stat.isreg is defined) or
+      (nextcloud_state == "updated" and _nextcloud_do_update)
+
 - import_tasks: access.yml
 
 - import_tasks: install.yml
diff --git a/vars/main.yml b/vars/main.yml
index c5b00ec..b85149e 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,6 +1,6 @@
 _nextcloud_config: "{{ _nextcloud_config_cmd.stdout | from_json }}"
 _nextcloud_latest_version: "{{ lookup('template','nextcloud-latest.json.j2') |from_json }}"
-_nextcloud_actual_version: "{{ _nextcloud_get_actual_version_command.stdout }}"
+_nextcloud_actual_version: "{{ _nextcloud_get_actual_version_command.stdout | default(0) }}"
 _nextcloud_apps: "{{ lookup('template','nextcloud-apps.json.j2') }}"
 _nextcloud_apps_enabled: "{{ _nextcloud_occ_app_list.stdout | from_yaml | json_query('Enabled|[]|map(&keys(@), @)|[]') }}"
 _nextcloud_apps_disabled: "{{ _nextcloud_occ_app_list.stdout | from_yaml | json_query('Disabled|[]') }}"