diff --git a/bundles/nextcloud/files/upgrade_status.php b/bundles/nextcloud/files/upgrade_status.php
new file mode 100644
index 0000000..8c15c3b
--- /dev/null
+++ b/bundles/nextcloud/files/upgrade_status.php
@@ -0,0 +1,9 @@
+<?php
+
+require_once __DIR__ . '/lib/base.php';
+
+if (\OCP\Util::needUpgrade()) {
+    exit(99);
+} else {
+    exit(0);
+}
diff --git a/bundles/nextcloud/items.py b/bundles/nextcloud/items.py
index d8eee4e..04e9f76 100644
--- a/bundles/nextcloud/items.py
+++ b/bundles/nextcloud/items.py
@@ -114,10 +114,20 @@ actions['install_nextcloud'] = {
 
 # UPGRADE
 
+files['/opt/nextcloud/upgrade_status.php'] = {
+    'owner': 'www-data',
+    'group': 'www-data',
+    'mode': '640',
+    'needs': [
+        'action:extract_nextcloud',
+    ],
+}
+    
 actions['upgrade_nextcloud'] = {
     'command': repo.libs.nextcloud.occ('upgrade'),
-    'unless': "! " + repo.libs.nextcloud.occ('status') + ' 2>&1 1>/dev/null | grep -q "Nextcloud or one of the apps require upgrade"',
+    'unless': 'sudo -u www-data php /opt/nextcloud/upgrade_status.php; test $? -ne 99',
     'needs': [
+        'file:/opt/nextcloud/upgrade_status.php',
         'action:install_nextcloud',
     ],
 }
@@ -140,7 +150,6 @@ files['/opt/nextcloud/rescan'] = {
     'group': 'www-data',
     'mode': '550',
     'needs': [
-        'directory:/opt/nextcloud',
         'action:extract_nextcloud',
     ],
 }