diff --git a/bundles/nextcloud/files/upgrade_status.php b/bundles/nextcloud/files/upgrade_status.php
index 8c15c3b..2cde730 100644
--- a/bundles/nextcloud/files/upgrade_status.php
+++ b/bundles/nextcloud/files/upgrade_status.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/lib/base.php';
+require_once '/opt/nextcloud/lib/base.php';
 
 if (\OCP\Util::needUpgrade()) {
     exit(99);
diff --git a/bundles/nextcloud/items.py b/bundles/nextcloud/items.py
index 04e9f76..151c04b 100644
--- a/bundles/nextcloud/items.py
+++ b/bundles/nextcloud/items.py
@@ -114,7 +114,8 @@ actions['install_nextcloud'] = {
 
 # UPGRADE
 
-files['/opt/nextcloud/upgrade_status.php'] = {
+files['/opt/nextcloud_upgrade_status.php'] = {
+    'source': 'upgrade_status.php',
     'owner': 'www-data',
     'group': 'www-data',
     'mode': '640',
@@ -127,7 +128,7 @@ actions['upgrade_nextcloud'] = {
     'command': repo.libs.nextcloud.occ('upgrade'),
     'unless': 'sudo -u www-data php /opt/nextcloud/upgrade_status.php; test $? -ne 99',
     'needs': [
-        'file:/opt/nextcloud/upgrade_status.php',
+        'file:/opt/nextcloud_upgrade_status.php',
         'action:install_nextcloud',
     ],
 }
@@ -145,7 +146,8 @@ actions['nextcloud_add_missing_inidces'] = {
 
 # RESCAN
 
-files['/opt/nextcloud/rescan'] = {
+files['/opt/nextcloud_rescan'] = {
+    'source': 'rescan',
     'owner': 'www-data',
     'group': 'www-data',
     'mode': '550',
diff --git a/bundles/nextcloud/metadata.py b/bundles/nextcloud/metadata.py
index ef18055..757675c 100644
--- a/bundles/nextcloud/metadata.py
+++ b/bundles/nextcloud/metadata.py
@@ -73,7 +73,7 @@ defaults = {
             'user': 'www-data',
         },
         'nextcloud-rescan': {
-            'command': '/opt/nextcloud/rescan',
+            'command': '/opt/nextcloud_rescan',
             'when': 'Sun 00:00:00',
             'user': 'www-data',
         },