diff --git a/Containers/nextcloud/notify.sh b/Containers/nextcloud/notify.sh
index f6090626..71768a23 100644
--- a/Containers/nextcloud/notify.sh
+++ b/Containers/nextcloud/notify.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [[ "$EUID" = 0 ]]; then
-    sudo -u www-data -s
+    sudo -u www-data -sE
 fi
 
 SUBJECT="$1"
diff --git a/Containers/nextcloud/start.sh b/Containers/nextcloud/start.sh
index 0d32c0d2..8ca26e70 100644
--- a/Containers/nextcloud/start.sh
+++ b/Containers/nextcloud/start.sh
@@ -34,7 +34,7 @@ if ! [ -f "$NEXTCLOUD_DATA_DIR/this-is-a-test-file" ]; then
     chown -R www-data:root "$NEXTCLOUD_DATA_DIR"
     chmod 750 -R "$NEXTCLOUD_DATA_DIR"
 fi
-rm -f "$NEXTCLOUD_DATA_DIR/this-is-a-test-file"
+sudo -u www-data rm -f "$NEXTCLOUD_DATA_DIR/this-is-a-test-file"
 
 # Run original entrypoint
 if ! sudo -u www-data bash /entrypoint.sh; then