diff --git a/nextcloud/Containerfile b/nextcloud/Containerfile
index fe33842..b162adc 100644
--- a/nextcloud/Containerfile
+++ b/nextcloud/Containerfile
@@ -37,7 +37,9 @@ RUN export PSQLV="$(psql -V | cut -d ' ' -f 3 | cut -d '.' -f 1)" && \
     echo "export PSQLV=$PSQLV" >> /vol/data/etc/environment && \
     echo "export PHPV=$PHPV" >> /vol/data/etc/environment && \
     echo "export DBUSER=$DBUSER" >> /vol/data/etc/environment && \
-    echo "export DBNAME=$DBNAME" >> /vol/data/etc/environment
+    echo "export DBNAME=$DBNAME" >> /vol/data/etc/environment && \
+    rm -f /etc/environment && \
+    ln -s /vol/data/etc/environment /etc/environment
 
 # change www-data's UID to the file owner UID
 ### RUN usermod --uid $FILESUID www-data && \
diff --git a/nextcloud/Initfile b/nextcloud/Initfile
index 4769775..a5ef5fd 100644
--- a/nextcloud/Initfile
+++ b/nextcloud/Initfile
@@ -33,3 +33,5 @@ nc-occ config:app:set dav calendarSubscriptionRefreshRate --value PT1H
 
 # finish configuration
 nc-occ db:add-missing-indices
+nc-occ maintenance:repair --include-expensive
+
diff --git a/nextcloud/scripts/clean.sh b/nextcloud/scripts/clean.sh
new file mode 100644
index 0000000..d1b1e97
--- /dev/null
+++ b/nextcloud/scripts/clean.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+for tag in $(podman images --filter reference=nextcloud --format='{{.Tag}}')
+do
+    echo "Removing image nextcloud:$tag"
+    podman rmi -f nextcloud:$tag
+done
+
+podman unshare rm -rf $HOME/vol/nextcloud
+