diff --git a/bundles/nextcloud/README.md b/bundles/nextcloud/README.md
new file mode 100644
index 0000000..781e3e8
--- /dev/null
+++ b/bundles/nextcloud/README.md
@@ -0,0 +1 @@
+https://help.nextcloud.com/t/error-the-files-of-the-app-viewer-were-not-replaced-correctly-after-upgrading/75521/4
diff --git a/bundles/nextcloud/files/shipped.json b/bundles/nextcloud/files/shipped.json
new file mode 100644
index 0000000..c14132c
--- /dev/null
+++ b/bundles/nextcloud/files/shipped.json
@@ -0,0 +1,16 @@
+{
+  "shippedApps": [],
+  "alwaysEnabled": [
+    "files",
+    "cloud_federation_api",
+    "dav",
+    "federatedfilesharing",
+    "lookup_server_connector",
+    "provisioning_api",
+    "oauth2",
+    "settings",
+    "twofactor_backupcodes",
+    "viewer",
+    "workflowengine"
+  ]
+}
diff --git a/bundles/nextcloud/items.py b/bundles/nextcloud/items.py
index f8f2e48..3b8f4a2 100644
--- a/bundles/nextcloud/items.py
+++ b/bundles/nextcloud/items.py
@@ -4,23 +4,25 @@ from shlex import quote
 from os.path import join
 from mako.template import Template
 
-print(f"v{node.metadata.get('nextcloud/version')}")
-
 
 directories = {
     '/opt/nextcloud': {},
     '/etc/nextcloud': {
         'owner': 'www-data',
+        'group': 'www-data',
     },
     '/var/lib/nextcloud': {
         'owner': 'www-data',
+        'group': 'www-data',
         'mode': '770',
     },
     '/var/lib/nextcloud/.apps': {
         'owner': 'www-data',
+        'group': 'www-data',
     },
     '/var/lib/nextcloud/.cache': {
         'owner': 'www-data',
+        'group': 'www-data',
     },
 }
 
@@ -45,6 +47,7 @@ symlinks = {
     '/opt/nextcloud/config': {
         'target': '/etc/nextcloud',
         'owner': 'www-data',
+        'group': 'www-data',
         'needs': [
             'git_deploy:/opt/nextcloud',
         ],
@@ -52,6 +55,7 @@ symlinks = {
     '/opt/nextcloud/userapps': {
         'target': '/var/lib/nextcloud/.apps',
         'owner': 'www-data',
+        'group': 'www-data',
         'needs': [
             'git_deploy:/opt/nextcloud',
         ],
@@ -59,9 +63,15 @@ symlinks = {
 }
 
 files = {
+    # '/opt/nextcloud/core/shipped.json': {
+    #     'needs': [
+    #         'git_deploy:/opt/nextcloud',
+    #     ],
+    # },
     '/etc/nextcloud/CAN_INSTALL': {
         'content': '',
         'owner': 'www-data',
+        'group': 'www-data',
         'mode': '640',
         'needs': [
             'directory:/etc/nextcloud',
@@ -70,6 +80,7 @@ files = {
     '/etc/nextcloud/managed.config.php': {
         'content_type': 'mako',
         'owner': 'www-data',
+        'group': 'www-data',
         'mode': '640',
         'context': {
             'db_password': node.metadata.get('postgresql/roles/nextcloud/password'),
@@ -116,7 +127,7 @@ actions['install_nextcloud'] = {
 
 actions['upgrade_nextcloud'] = {
     'command': repo.libs.nextcloud.occ('upgrade'),
-    'unless': repo.libs.nextcloud.occ('status') + f' | grep -q "versionstring: {node.metadata.get("nextcloud/version")}"',
+    'unless': "! " + repo.libs.nextcloud.occ('status') + ' | grep -q "Nextcloud or one of the apps require upgrade"',
     'needs': [
         'action:install_nextcloud',
     ],
diff --git a/nodes/htz.mails.py b/nodes/htz.mails.py
index 0e30363..d650105 100644
--- a/nodes/htz.mails.py
+++ b/nodes/htz.mails.py
@@ -18,7 +18,7 @@
     'metadata': {
         'nextcloud': {
             'domain': 'cloud.sublimity.de',
-            'version': '21.0.0',
+            'version': '20.0.10',
         },
         'id': 'ea29bdf0-0b47-4bf4-8346-67d60c9dc4ae',
         'bind': {