diff --git a/files/backup-postgres.sh b/files/backup-postgres.sh
index f67b19a..70c7f3d 100644
--- a/files/backup-postgres.sh
+++ b/files/backup-postgres.sh
@@ -11,3 +11,5 @@ if podman container exists "${user}-database"; then
 else
   echo "${user}-database" not found
 fi
+echo "Deleting older than 7 days files"
+find "${host_dir}" -maxdepth 1 -type d -mtime +7 -exec rm -rf {} +
diff --git a/generate-config.sh b/generate-config.sh
index afe7874..16b88a6 100755
--- a/generate-config.sh
+++ b/generate-config.sh
@@ -4,7 +4,7 @@ set -o errexit -o pipefail -o noclobber -o nounset -o errtrace -o functrace
 shopt -s dotglob
 
 quadlet_template="
-    - path: /home/__USER__/.config/containers/systemd/user/__FILE__
+    - path: /home/__USER__/.config/containers/systemd/__FILE__
       mode: 0644
       contents:
         local: quadlets/__USER__/__FILE__
@@ -44,13 +44,14 @@ files_template="
 users=('arr' 'gitea' 'homeassistant' 'immich' 'jdownloader' 'kiwix' 'komga' 'navidrome' 'nextcloud' 'nginx' 'pairdrop' 'paperless' 'pihole' 'qbittorrent' 'synapse' 'tga' 'wallabag')
 mkdir -p users
 for user in "${users[@]}"; do
+    echo "Generating ${user}"
     user_butane="users/${user}.bu"
     sed "s/__USER__/${user}/g" user-template.bu >| "${user_butane}"
     if [[ -d "quadlets/${user}" ]]; then
       directory_template_user="${directory_template//__USER__/${user}}"
       for file in "quadlets/${user}/"*.volume; do
         if [[ -f "${file}" ]]; then
-          content="$(grep "Device" "${file}")"
+          content="$(grep "Device" "${file}" || echo "none")"
           if [[ "${content}" =~ ^Device=/var/mnt/nas/containers/${user}/storage/(.+)$ ]]; then
             volume="${BASH_REMATCH[1]}"
             printf '%s' "${directory_template_user//__VOLUME__/${volume}}" >> "${user_butane}"
diff --git a/home/immich/.secrets b/home/immich/.secrets
index adb9946..adfbd67 100644
--- a/home/immich/.secrets
+++ b/home/immich/.secrets
@@ -1 +1,2 @@
 database-password=U6WKyoCU4fw8rfB8ezpXVZJQc3s3lcoe
+redis-password=CUANcGnIXjI5xe9CSio04HER
diff --git a/pi4.bu b/pi4.bu
index 3a48170..1af42c3 100644
--- a/pi4.bu
+++ b/pi4.bu
@@ -6,6 +6,7 @@ ignition:
       - local: users/arr.ign
       - local: users/gitea.ign
       - local: users/homeassistant.ign
+      - local: users/immich.ign
       - local: users/jdownloader.ign
       - local: users/kiwix.ign
       - local: users/komga.ign
diff --git a/quadlets/immich/immich-database.container b/quadlets/immich/immich-database.container
index b245574..bbcab8c 100644
--- a/quadlets/immich/immich-database.container
+++ b/quadlets/immich/immich-database.container
@@ -4,23 +4,22 @@ Description=Immich database container
 [Container]
 AutoUpdate=registry
 ContainerName=immich-database
-Environment=DB_STORAGE_TYPE=HDD
 Environment=POSTGRES_USER=immich
 Environment=POSTGRES_DB=immich
-Environment=POSTGRES_INTIDB_ARGS=--data-checksums
+Environment=POSTGRES_INITDB_ARGS=--data-checksums
 Environment=TZ=Europe/Zurich
 HealthCmd=pg_isready -U immich
 HealthInterval=30s
 HealthTimeout=10s
 HealthRetries=5
-Image=ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0@sha256:bcf63357191b76a916ae5eb93464d65c07511da41e3bf7a8416db519b40b1c23
+Image=ghcr.io/immich-app/postgres:18-vectorchord0.5.3
 Label=io.containers.autoupdate=registry
 Pod=immich.pod
 Secret=database-password,type=env,target=POSTGRES_PASSWORD
 ShmSize=128m
 StartWithPod=true
 Timezone=Europe/Zurich
-Volume=immich-database.volume:/var/lib/postgresql/data
+Volume=immich-database.volume:/var/lib/postgresql
 Volume=/var/mnt/nas/containers/immich/storage/database-backup:/backup
 
 [Service]
diff --git a/quadlets/immich/immich-ml.container b/quadlets/immich/immich-ml.container
index 9b445e3..155b1b2 100644
--- a/quadlets/immich/immich-ml.container
+++ b/quadlets/immich/immich-ml.container
@@ -4,16 +4,10 @@ Description=Immich machine learning container
 [Container]
 AutoUpdate=registry
 ContainerName=immich-ml
-Environment=DB_DATA_LOCATION=./postgres
-Environment=DB_USERNAME=postgres
-Environment=DB_DATABASE_NAME=immich
-Environment=IMMICH_VERSION=v2
 Environment=TZ=Europe/Zurich
-Environment=UPLOAD_LOCATION=./library
 Image=ghcr.io/immich-app/immich-machine-learning:release
 Label=io.containers.autoupdate=registry
 Pod=immich.pod
-Secret=database-password,type=env,target=DB_PASSWORD
 StartWithPod=true
 Timezone=Europe/Zurich
 Volume=immich-ml-cache.volume:/cache
diff --git a/quadlets/immich/immich-redis.container b/quadlets/immich/immich-redis.container
index 488718e..b3b9d32 100644
--- a/quadlets/immich/immich-redis.container
+++ b/quadlets/immich/immich-redis.container
@@ -9,7 +9,7 @@ HealthCmd=redis-cli ping || exit 1
 HealthInterval=30s
 HealthTimeout=10s
 HealthRetries=5
-Image=docker.io/valkey/valkey:8@sha256:81db6d39e1bba3b3ff32bd3a1b19a6d69690f94a3954ec131277b9a26b95b3aa
+Image=docker.io/valkey/valkey:9
 Label=io.containers.autoupdate=registry
 Pod=immich.pod
 StartWithPod=true
diff --git a/quadlets/immich/immich.container b/quadlets/immich/immich.container
index f8a4012..6daa7ba 100644
--- a/quadlets/immich/immich.container
+++ b/quadlets/immich/immich.container
@@ -8,12 +8,16 @@ Requires=immich-redis.container
 [Container]
 AutoUpdate=registry
 ContainerName=immich
-Environment=DB_DATA_LOCATION=./postgres
-Environment=DB_USERNAME=immich
+Environment=CPU_CORES=2
 Environment=DB_DATABASE_NAME=immich
-Environment=IMMICH_VERSION=v2
+Environment=DB_HOSTNAME=immich-database
+Environment=DB_USERNAME=immich
+Environment=MACHINE_LEARNING_REQUEST_THREADS=1
+Environment=MACHINE_LEARNING_MODEL_INTER_OP_THREADS=1
+Environment=MACHINE_LEARNING_MODEL_INTRA_OP_THREADS=1
+Environment=MACHINE_LEARNING_WORKERS=1
+Environment=REDIS_HOSTNAME=immich-redis
 Environment=TZ=Europe/Zurich
-Environment=UPLOAD_LOCATION=./library
 Image=ghcr.io/immich-app/immich-server:release
 Label=io.containers.autoupdate=registry
 Pod=immich.pod
diff --git a/services/immich/backup-database.service b/services/immich/backup-database.service
index 81f4b1f..3403c52 100644
--- a/services/immich/backup-database.service
+++ b/services/immich/backup-database.service
@@ -3,4 +3,4 @@ Description=Backups the Immich database
 
 [Service]
 Type=oneshot
-ExecStart=/opt/bin/backup-database.sh
+ExecStart=/opt/bin/backup-postgres.sh
diff --git a/update-postgres b/update-postgres
new file mode 100644
index 0000000..6eb504e
--- /dev/null
+++ b/update-postgres
@@ -0,0 +1,51 @@
+#!/bin/bash
+set -o errexit -o pipefail -o nounset -o noclobber
+
+database=$1
+application=$2
+file="/home/$(whoami)/.config/containers/systemd/user/${database}.service"
+if [[ ! -f "${file}" ]]; then
+    echo "File ${file} not found"
+    exit 1
+fi
+content="$(cat "${file}")"
+version_pattern="^Image=docker.io/postgres:([\d]+)$"
+line=""
+new_line=""
+if [[ "${content}" =~ ${version_pattern} ]]; then
+    line="${BASH_REMATCH[0]}"
+    version="${BASH_REMATCH[1]}"
+    new_version="$(("${version}" + 1))"
+    new_line="Image=docker.io/postgres:${new_version}"
+else
+    echo "Version not found in ${file}"
+    exit 1
+fi
+
+systemctl --user stop "${application}" "${database}"
+
+podman run "${database}"
+podman exec -it "${database}" pg_dumpall -U postgres > dump.sql
+podman stop "${database}"
+
+podman volume create db_backup
+podman run --rm -it -v "${database}":/from -v db_backup:/to ubuntu bash -c "cd /from ; cp -av . /to"
+
+sed -i "s/${line}/${new_line}/" "${file}"
+sed -i "s/Pod=${application}.pod/#Pod=${application}.pod/" "${file}"
+sed -i "s/StartWithPod=true/#StartWithPod=true/" "${file}"
+systemctl --user daemon-reload
+
+systemctl --user start "${database}"
+podman exec -T "${database}" psql -U postgres < dump.sql
+read -n 1 -s -r -p "Press any key to continue..."
+systemctl --user stop "${database}"
+
+podman volume rm db_backup
+rm -f dump.sql
+
+sed -i "s/#Pod=${application}.pod/Pod=${application}.pod/" "${file}"
+sed -i "s/#StartWithPod=true/StartWithPod=true/" "${file}"
+systemctl --user daemon-reload
+
+systemctl --user start "${application}"
diff --git a/users/arr.bu b/users/arr.bu
index 671990d..c18205b 100644
--- a/users/arr.bu
+++ b/users/arr.bu
@@ -87,7 +87,7 @@ storage:
   files:
     - path: /var/lib/systemd/linger/arr
       mode: 0644
-    - path: /home/arr/.config/containers/systemd/user/arr.pod
+    - path: /home/arr/.config/containers/systemd/arr.pod
       mode: 0644
       contents:
         local: quadlets/arr/arr.pod
@@ -95,7 +95,7 @@ storage:
         name: arr
       group:
         name: arr
-    - path: /home/arr/.config/containers/systemd/user/bazarr-config.volume
+    - path: /home/arr/.config/containers/systemd/bazarr-config.volume
       mode: 0644
       contents:
         local: quadlets/arr/bazarr-config.volume
@@ -103,7 +103,7 @@ storage:
         name: arr
       group:
         name: arr
-    - path: /home/arr/.config/containers/systemd/user/bazarr.container
+    - path: /home/arr/.config/containers/systemd/bazarr.container
       mode: 0644
       contents:
         local: quadlets/arr/bazarr.container
@@ -111,7 +111,7 @@ storage:
         name: arr
       group:
         name: arr
-    - path: /home/arr/.config/containers/systemd/user/bazarr-data.volume
+    - path: /home/arr/.config/containers/systemd/bazarr-data.volume
       mode: 0644
       contents:
         local: quadlets/arr/bazarr-data.volume
@@ -119,7 +119,7 @@ storage:
         name: arr
       group:
         name: arr
-    - path: /home/arr/.config/containers/systemd/user/gluetun.container
+    - path: /home/arr/.config/containers/systemd/gluetun.container
       mode: 0644
       contents:
         local: quadlets/arr/gluetun.container
@@ -127,7 +127,7 @@ storage:
         name: arr
       group:
         name: arr
-    - path: /home/arr/.config/containers/systemd/user/lidarr-config.volume
+    - path: /home/arr/.config/containers/systemd/lidarr-config.volume
       mode: 0644
       contents:
         local: quadlets/arr/lidarr-config.volume
@@ -135,7 +135,7 @@ storage:
         name: arr
       group:
         name: arr
-    - path: /home/arr/.config/containers/systemd/user/lidarr.container
+    - path: /home/arr/.config/containers/systemd/lidarr.container
       mode: 0644
       contents:
         local: quadlets/arr/lidarr.container
@@ -143,7 +143,7 @@ storage:
         name: arr
       group:
         name: arr
-    - path: /home/arr/.config/containers/systemd/user/lidarr-data.volume
+    - path: /home/arr/.config/containers/systemd/lidarr-data.volume
       mode: 0644
       contents:
         local: quadlets/arr/lidarr-data.volume
@@ -151,7 +151,7 @@ storage:
         name: arr
       group:
         name: arr
-    - path: /home/arr/.config/containers/systemd/user/overseerr-config.volume
+    - path: /home/arr/.config/containers/systemd/overseerr-config.volume
       mode: 0644
       contents:
         local: quadlets/arr/overseerr-config.volume
@@ -159,7 +159,7 @@ storage:
         name: arr
       group:
         name: arr
-    - path: /home/arr/.config/containers/systemd/user/overseerr.container
+    - path: /home/arr/.config/containers/systemd/overseerr.container
       mode: 0644
       contents:
         local: quadlets/arr/overseerr.container
@@ -167,7 +167,7 @@ storage:
         name: arr
       group:
         name: arr
-    - path: /home/arr/.config/containers/systemd/user/prowlarr-config.volume
+    - path: /home/arr/.config/containers/systemd/prowlarr-config.volume
       mode: 0644
       contents:
         local: quadlets/arr/prowlarr-config.volume
@@ -175,7 +175,7 @@ storage:
         name: arr
       group:
         name: arr
-    - path: /home/arr/.config/containers/systemd/user/prowlarr.container
+    - path: /home/arr/.config/containers/systemd/prowlarr.container
       mode: 0644
       contents:
         local: quadlets/arr/prowlarr.container
@@ -183,7 +183,7 @@ storage:
         name: arr
       group:
         name: arr
-    - path: /home/arr/.config/containers/systemd/user/prowlarr-data.volume
+    - path: /home/arr/.config/containers/systemd/prowlarr-data.volume
       mode: 0644
       contents:
         local: quadlets/arr/prowlarr-data.volume
@@ -191,7 +191,7 @@ storage:
         name: arr
       group:
         name: arr
-    - path: /home/arr/.config/containers/systemd/user/radarr-config.volume
+    - path: /home/arr/.config/containers/systemd/radarr-config.volume
       mode: 0644
       contents:
         local: quadlets/arr/radarr-config.volume
@@ -199,7 +199,7 @@ storage:
         name: arr
       group:
         name: arr
-    - path: /home/arr/.config/containers/systemd/user/radarr.container
+    - path: /home/arr/.config/containers/systemd/radarr.container
       mode: 0644
       contents:
         local: quadlets/arr/radarr.container
@@ -207,7 +207,7 @@ storage:
         name: arr
       group:
         name: arr
-    - path: /home/arr/.config/containers/systemd/user/radarr-data.volume
+    - path: /home/arr/.config/containers/systemd/radarr-data.volume
       mode: 0644
       contents:
         local: quadlets/arr/radarr-data.volume
@@ -215,7 +215,7 @@ storage:
         name: arr
       group:
         name: arr
-    - path: /home/arr/.config/containers/systemd/user/sonarr-config.volume
+    - path: /home/arr/.config/containers/systemd/sonarr-config.volume
       mode: 0644
       contents:
         local: quadlets/arr/sonarr-config.volume
@@ -223,7 +223,7 @@ storage:
         name: arr
       group:
         name: arr
-    - path: /home/arr/.config/containers/systemd/user/sonarr.container
+    - path: /home/arr/.config/containers/systemd/sonarr.container
       mode: 0644
       contents:
         local: quadlets/arr/sonarr.container
@@ -231,7 +231,7 @@ storage:
         name: arr
       group:
         name: arr
-    - path: /home/arr/.config/containers/systemd/user/sonarr-data.volume
+    - path: /home/arr/.config/containers/systemd/sonarr-data.volume
       mode: 0644
       contents:
         local: quadlets/arr/sonarr-data.volume
diff --git a/users/gitea.bu b/users/gitea.bu
index 811ca51..725629c 100644
--- a/users/gitea.bu
+++ b/users/gitea.bu
@@ -18,12 +18,6 @@ storage:
       group:
         name: gitea
 
-    - path: /var/mnt/nas/containers/gitea/storage/database-data
-      mode: 0755
-      user:
-        name: gitea
-      group:
-        name: gitea
     - path: /var/mnt/nas/containers/gitea/storage/data
       mode: 0755
       user:
@@ -33,7 +27,7 @@ storage:
   files:
     - path: /var/lib/systemd/linger/gitea
       mode: 0644
-    - path: /home/gitea/.config/containers/systemd/user/gitea.container
+    - path: /home/gitea/.config/containers/systemd/gitea.container
       mode: 0644
       contents:
         local: quadlets/gitea/gitea.container
@@ -41,7 +35,7 @@ storage:
         name: gitea
       group:
         name: gitea
-    - path: /home/gitea/.config/containers/systemd/user/gitea-database.container
+    - path: /home/gitea/.config/containers/systemd/gitea-database.container
       mode: 0644
       contents:
         local: quadlets/gitea/gitea-database.container
@@ -49,7 +43,7 @@ storage:
         name: gitea
       group:
         name: gitea
-    - path: /home/gitea/.config/containers/systemd/user/gitea-database.volume
+    - path: /home/gitea/.config/containers/systemd/gitea-database.volume
       mode: 0644
       contents:
         local: quadlets/gitea/gitea-database.volume
@@ -57,7 +51,7 @@ storage:
         name: gitea
       group:
         name: gitea
-    - path: /home/gitea/.config/containers/systemd/user/gitea-data.volume
+    - path: /home/gitea/.config/containers/systemd/gitea-data.volume
       mode: 0644
       contents:
         local: quadlets/gitea/gitea-data.volume
@@ -65,7 +59,7 @@ storage:
         name: gitea
       group:
         name: gitea
-    - path: /home/gitea/.config/containers/systemd/user/gitea.pod
+    - path: /home/gitea/.config/containers/systemd/gitea.pod
       mode: 0644
       contents:
         local: quadlets/gitea/gitea.pod
@@ -79,5 +73,21 @@ storage:
         local: home/gitea/.secrets
       user:
         name: gitea
+      group:
+        name: gitea
+    - path: /var/home/gitea/.config/systemd/user/backup-database.service
+      mode: 0755
+      contents:
+        local: services/gitea/backup-database.service
+      user:
+        name: gitea
+      group:
+        name: gitea
+    - path: /var/home/gitea/.config/systemd/user/backup-database.timer
+      mode: 0755
+      contents:
+        local: services/gitea/backup-database.timer
+      user:
+        name: gitea
       group:
         name: gitea
\ No newline at end of file
diff --git a/users/homeassistant.bu b/users/homeassistant.bu
index 4aebc9e..ceeaecb 100644
--- a/users/homeassistant.bu
+++ b/users/homeassistant.bu
@@ -33,7 +33,7 @@ storage:
   files:
     - path: /var/lib/systemd/linger/homeassistant
       mode: 0644
-    - path: /home/homeassistant/.config/containers/systemd/user/homeassistant-config.volume
+    - path: /home/homeassistant/.config/containers/systemd/homeassistant-config.volume
       mode: 0644
       contents:
         local: quadlets/homeassistant/homeassistant-config.volume
@@ -41,7 +41,7 @@ storage:
         name: homeassistant
       group:
         name: homeassistant
-    - path: /home/homeassistant/.config/containers/systemd/user/homeassistant.container
+    - path: /home/homeassistant/.config/containers/systemd/homeassistant.container
       mode: 0644
       contents:
         local: quadlets/homeassistant/homeassistant.container
@@ -49,7 +49,7 @@ storage:
         name: homeassistant
       group:
         name: homeassistant
-    - path: /home/homeassistant/.config/containers/systemd/user/homeassistant.pod
+    - path: /home/homeassistant/.config/containers/systemd/homeassistant.pod
       mode: 0644
       contents:
         local: quadlets/homeassistant/homeassistant.pod
@@ -57,7 +57,7 @@ storage:
         name: homeassistant
       group:
         name: homeassistant
-    - path: /home/homeassistant/.config/containers/systemd/user/homeassistant-ssh.volume
+    - path: /home/homeassistant/.config/containers/systemd/homeassistant-ssh.volume
       mode: 0644
       contents:
         local: quadlets/homeassistant/homeassistant-ssh.volume
diff --git a/users/immich.bu b/users/immich.bu
new file mode 100644
index 0000000..8ca8d62
--- /dev/null
+++ b/users/immich.bu
@@ -0,0 +1,117 @@
+variant: fcos
+version: 1.6.0
+passwd:
+  users:
+    - name: immich
+storage:
+  directories:
+    - path: /home/immich/.config/systemd/user
+      mode: 0755
+      user:
+        name: immich
+      group:
+        name: immich
+    - path: /var/mnt/nas/containers/immich
+      mode: 0755
+      user:
+        name: immich
+      group:
+        name: immich
+
+    - path: /var/mnt/nas/containers/immich/storage/data
+      mode: 0755
+      user:
+        name: immich
+      group:
+        name: immich
+  files:
+    - path: /var/lib/systemd/linger/immich
+      mode: 0644
+    - path: /home/immich/.config/containers/systemd/immich.container
+      mode: 0644
+      contents:
+        local: quadlets/immich/immich.container
+      user:
+        name: immich
+      group:
+        name: immich
+    - path: /home/immich/.config/containers/systemd/immich-database.container
+      mode: 0644
+      contents:
+        local: quadlets/immich/immich-database.container
+      user:
+        name: immich
+      group:
+        name: immich
+    - path: /home/immich/.config/containers/systemd/immich-database.volume
+      mode: 0644
+      contents:
+        local: quadlets/immich/immich-database.volume
+      user:
+        name: immich
+      group:
+        name: immich
+    - path: /home/immich/.config/containers/systemd/immich-data.volume
+      mode: 0644
+      contents:
+        local: quadlets/immich/immich-data.volume
+      user:
+        name: immich
+      group:
+        name: immich
+    - path: /home/immich/.config/containers/systemd/immich-ml-cache.volume
+      mode: 0644
+      contents:
+        local: quadlets/immich/immich-ml-cache.volume
+      user:
+        name: immich
+      group:
+        name: immich
+    - path: /home/immich/.config/containers/systemd/immich-ml.container
+      mode: 0644
+      contents:
+        local: quadlets/immich/immich-ml.container
+      user:
+        name: immich
+      group:
+        name: immich
+    - path: /home/immich/.config/containers/systemd/immich.pod
+      mode: 0644
+      contents:
+        local: quadlets/immich/immich.pod
+      user:
+        name: immich
+      group:
+        name: immich
+    - path: /home/immich/.config/containers/systemd/immich-redis.container
+      mode: 0644
+      contents:
+        local: quadlets/immich/immich-redis.container
+      user:
+        name: immich
+      group:
+        name: immich
+    - path: /var/home/immich/.secrets
+      mode: 0755
+      contents:
+        local: home/immich/.secrets
+      user:
+        name: immich
+      group:
+        name: immich
+    - path: /var/home/immich/.config/systemd/user/backup-database.service
+      mode: 0755
+      contents:
+        local: services/immich/backup-database.service
+      user:
+        name: immich
+      group:
+        name: immich
+    - path: /var/home/immich/.config/systemd/user/backup-database.timer
+      mode: 0755
+      contents:
+        local: services/immich/backup-database.timer
+      user:
+        name: immich
+      group:
+        name: immich
\ No newline at end of file
diff --git a/users/jdownloader.bu b/users/jdownloader.bu
index 7999740..ba15459 100644
--- a/users/jdownloader.bu
+++ b/users/jdownloader.bu
@@ -33,7 +33,7 @@ storage:
   files:
     - path: /var/lib/systemd/linger/jdownloader
       mode: 0644
-    - path: /home/jdownloader/.config/containers/systemd/user/jdownloader-config.volume
+    - path: /home/jdownloader/.config/containers/systemd/jdownloader-config.volume
       mode: 0644
       contents:
         local: quadlets/jdownloader/jdownloader-config.volume
@@ -41,7 +41,7 @@ storage:
         name: jdownloader
       group:
         name: jdownloader
-    - path: /home/jdownloader/.config/containers/systemd/user/jdownloader.container
+    - path: /home/jdownloader/.config/containers/systemd/jdownloader.container
       mode: 0644
       contents:
         local: quadlets/jdownloader/jdownloader.container
@@ -49,7 +49,7 @@ storage:
         name: jdownloader
       group:
         name: jdownloader
-    - path: /home/jdownloader/.config/containers/systemd/user/jdownloader-output.volume
+    - path: /home/jdownloader/.config/containers/systemd/jdownloader-output.volume
       mode: 0644
       contents:
         local: quadlets/jdownloader/jdownloader-output.volume
@@ -57,7 +57,7 @@ storage:
         name: jdownloader
       group:
         name: jdownloader
-    - path: /home/jdownloader/.config/containers/systemd/user/jdownloader.pod
+    - path: /home/jdownloader/.config/containers/systemd/jdownloader.pod
       mode: 0644
       contents:
         local: quadlets/jdownloader/jdownloader.pod
diff --git a/users/kiwix.bu b/users/kiwix.bu
index 51b3945..167e920 100644
--- a/users/kiwix.bu
+++ b/users/kiwix.bu
@@ -27,7 +27,7 @@ storage:
   files:
     - path: /var/lib/systemd/linger/kiwix
       mode: 0644
-    - path: /home/kiwix/.config/containers/systemd/user/kiwix.container
+    - path: /home/kiwix/.config/containers/systemd/kiwix.container
       mode: 0644
       contents:
         local: quadlets/kiwix/kiwix.container
@@ -35,7 +35,7 @@ storage:
         name: kiwix
       group:
         name: kiwix
-    - path: /home/kiwix/.config/containers/systemd/user/kiwix-data.volume
+    - path: /home/kiwix/.config/containers/systemd/kiwix-data.volume
       mode: 0644
       contents:
         local: quadlets/kiwix/kiwix-data.volume
@@ -43,7 +43,7 @@ storage:
         name: kiwix
       group:
         name: kiwix
-    - path: /home/kiwix/.config/containers/systemd/user/kiwix.pod
+    - path: /home/kiwix/.config/containers/systemd/kiwix.pod
       mode: 0644
       contents:
         local: quadlets/kiwix/kiwix.pod
diff --git a/users/komga.bu b/users/komga.bu
index 9983f83..cb92bfa 100644
--- a/users/komga.bu
+++ b/users/komga.bu
@@ -33,7 +33,7 @@ storage:
   files:
     - path: /var/lib/systemd/linger/komga
       mode: 0644
-    - path: /home/komga/.config/containers/systemd/user/komga-config.volume
+    - path: /home/komga/.config/containers/systemd/komga-config.volume
       mode: 0644
       contents:
         local: quadlets/komga/komga-config.volume
@@ -41,7 +41,7 @@ storage:
         name: komga
       group:
         name: komga
-    - path: /home/komga/.config/containers/systemd/user/komga.container
+    - path: /home/komga/.config/containers/systemd/komga.container
       mode: 0644
       contents:
         local: quadlets/komga/komga.container
@@ -49,7 +49,7 @@ storage:
         name: komga
       group:
         name: komga
-    - path: /home/komga/.config/containers/systemd/user/komga-data.volume
+    - path: /home/komga/.config/containers/systemd/komga-data.volume
       mode: 0644
       contents:
         local: quadlets/komga/komga-data.volume
@@ -57,7 +57,7 @@ storage:
         name: komga
       group:
         name: komga
-    - path: /home/komga/.config/containers/systemd/user/komga.pod
+    - path: /home/komga/.config/containers/systemd/komga.pod
       mode: 0644
       contents:
         local: quadlets/komga/komga.pod
diff --git a/users/navidrome.bu b/users/navidrome.bu
index 226e2c4..7819bc0 100644
--- a/users/navidrome.bu
+++ b/users/navidrome.bu
@@ -33,7 +33,7 @@ storage:
   files:
     - path: /var/lib/systemd/linger/navidrome
       mode: 0644
-    - path: /home/navidrome/.config/containers/systemd/user/navidrome.container
+    - path: /home/navidrome/.config/containers/systemd/navidrome.container
       mode: 0644
       contents:
         local: quadlets/navidrome/navidrome.container
@@ -41,7 +41,7 @@ storage:
         name: navidrome
       group:
         name: navidrome
-    - path: /home/navidrome/.config/containers/systemd/user/navidrome-data.volume
+    - path: /home/navidrome/.config/containers/systemd/navidrome-data.volume
       mode: 0644
       contents:
         local: quadlets/navidrome/navidrome-data.volume
@@ -49,7 +49,7 @@ storage:
         name: navidrome
       group:
         name: navidrome
-    - path: /home/navidrome/.config/containers/systemd/user/navidrome-music.volume
+    - path: /home/navidrome/.config/containers/systemd/navidrome-music.volume
       mode: 0644
       contents:
         local: quadlets/navidrome/navidrome-music.volume
@@ -57,7 +57,7 @@ storage:
         name: navidrome
       group:
         name: navidrome
-    - path: /home/navidrome/.config/containers/systemd/user/navidrome.pod
+    - path: /home/navidrome/.config/containers/systemd/navidrome.pod
       mode: 0644
       contents:
         local: quadlets/navidrome/navidrome.pod
diff --git a/users/nextcloud.bu b/users/nextcloud.bu
index 27eb0c3..f8b74f6 100644
--- a/users/nextcloud.bu
+++ b/users/nextcloud.bu
@@ -30,12 +30,6 @@ storage:
         name: nextcloud
       group:
         name: nextcloud
-    - path: /var/mnt/nas/containers/nextcloud/storage/database
-      mode: 0755
-      user:
-        name: nextcloud
-      group:
-        name: nextcloud
     - path: /var/mnt/nas/containers/nextcloud/storage/data
       mode: 0755
       user:
@@ -60,12 +54,6 @@ storage:
         name: nextcloud
       group:
         name: nextcloud
-    - path: /var/mnt/nas/containers/nextcloud/storage/redis-data
-      mode: 0755
-      user:
-        name: nextcloud
-      group:
-        name: nextcloud
     - path: /var/mnt/nas/containers/nextcloud/storage/themes
       mode: 0755
       user:
@@ -75,7 +63,7 @@ storage:
   files:
     - path: /var/lib/systemd/linger/nextcloud
       mode: 0644
-    - path: /home/nextcloud/.config/containers/systemd/user/nextcloud-apps.volume
+    - path: /home/nextcloud/.config/containers/systemd/nextcloud-apps.volume
       mode: 0644
       contents:
         local: quadlets/nextcloud/nextcloud-apps.volume
@@ -83,7 +71,7 @@ storage:
         name: nextcloud
       group:
         name: nextcloud
-    - path: /home/nextcloud/.config/containers/systemd/user/nextcloud-config.volume
+    - path: /home/nextcloud/.config/containers/systemd/nextcloud-config.volume
       mode: 0644
       contents:
         local: quadlets/nextcloud/nextcloud-config.volume
@@ -91,7 +79,7 @@ storage:
         name: nextcloud
       group:
         name: nextcloud
-    - path: /home/nextcloud/.config/containers/systemd/user/nextcloud.container
+    - path: /home/nextcloud/.config/containers/systemd/nextcloud.container
       mode: 0644
       contents:
         local: quadlets/nextcloud/nextcloud.container
@@ -99,7 +87,7 @@ storage:
         name: nextcloud
       group:
         name: nextcloud
-    - path: /home/nextcloud/.config/containers/systemd/user/nextcloud-cron.container
+    - path: /home/nextcloud/.config/containers/systemd/nextcloud-cron.container
       mode: 0644
       contents:
         local: quadlets/nextcloud/nextcloud-cron.container
@@ -107,7 +95,7 @@ storage:
         name: nextcloud
       group:
         name: nextcloud
-    - path: /home/nextcloud/.config/containers/systemd/user/nextcloud-database.container
+    - path: /home/nextcloud/.config/containers/systemd/nextcloud-database.container
       mode: 0644
       contents:
         local: quadlets/nextcloud/nextcloud-database.container
@@ -115,7 +103,7 @@ storage:
         name: nextcloud
       group:
         name: nextcloud
-    - path: /home/nextcloud/.config/containers/systemd/user/nextcloud-database.volume
+    - path: /home/nextcloud/.config/containers/systemd/nextcloud-database.volume
       mode: 0644
       contents:
         local: quadlets/nextcloud/nextcloud-database.volume
@@ -123,7 +111,7 @@ storage:
         name: nextcloud
       group:
         name: nextcloud
-    - path: /home/nextcloud/.config/containers/systemd/user/nextcloud-data.volume
+    - path: /home/nextcloud/.config/containers/systemd/nextcloud-data.volume
       mode: 0644
       contents:
         local: quadlets/nextcloud/nextcloud-data.volume
@@ -131,7 +119,15 @@ storage:
         name: nextcloud
       group:
         name: nextcloud
-    - path: /home/nextcloud/.config/containers/systemd/user/nextcloud-html.volume
+    - path: /home/nextcloud/.config/containers/systemd/nextcloud-harp.container
+      mode: 0644
+      contents:
+        local: quadlets/nextcloud/nextcloud-harp.container
+      user:
+        name: nextcloud
+      group:
+        name: nextcloud
+    - path: /home/nextcloud/.config/containers/systemd/nextcloud-html.volume
       mode: 0644
       contents:
         local: quadlets/nextcloud/nextcloud-html.volume
@@ -139,7 +135,7 @@ storage:
         name: nextcloud
       group:
         name: nextcloud
-    - path: /home/nextcloud/.config/containers/systemd/user/nextcloud-php-config.volume
+    - path: /home/nextcloud/.config/containers/systemd/nextcloud-php-config.volume
       mode: 0644
       contents:
         local: quadlets/nextcloud/nextcloud-php-config.volume
@@ -147,7 +143,7 @@ storage:
         name: nextcloud
       group:
         name: nextcloud
-    - path: /home/nextcloud/.config/containers/systemd/user/nextcloud.pod
+    - path: /home/nextcloud/.config/containers/systemd/nextcloud.pod
       mode: 0644
       contents:
         local: quadlets/nextcloud/nextcloud.pod
@@ -155,7 +151,7 @@ storage:
         name: nextcloud
       group:
         name: nextcloud
-    - path: /home/nextcloud/.config/containers/systemd/user/nextcloud-redis-config.volume
+    - path: /home/nextcloud/.config/containers/systemd/nextcloud-redis-config.volume
       mode: 0644
       contents:
         local: quadlets/nextcloud/nextcloud-redis-config.volume
@@ -163,7 +159,7 @@ storage:
         name: nextcloud
       group:
         name: nextcloud
-    - path: /home/nextcloud/.config/containers/systemd/user/nextcloud-redis.container
+    - path: /home/nextcloud/.config/containers/systemd/nextcloud-redis.container
       mode: 0644
       contents:
         local: quadlets/nextcloud/nextcloud-redis.container
@@ -171,7 +167,7 @@ storage:
         name: nextcloud
       group:
         name: nextcloud
-    - path: /home/nextcloud/.config/containers/systemd/user/nextcloud-redis-data.volume
+    - path: /home/nextcloud/.config/containers/systemd/nextcloud-redis-data.volume
       mode: 0644
       contents:
         local: quadlets/nextcloud/nextcloud-redis-data.volume
@@ -179,7 +175,7 @@ storage:
         name: nextcloud
       group:
         name: nextcloud
-    - path: /home/nextcloud/.config/containers/systemd/user/nextcloud-themes.volume
+    - path: /home/nextcloud/.config/containers/systemd/nextcloud-themes.volume
       mode: 0644
       contents:
         local: quadlets/nextcloud/nextcloud-themes.volume
@@ -203,6 +199,22 @@ storage:
         name: nextcloud
       group:
         name: nextcloud
+    - path: /var/home/nextcloud/.config/systemd/user/backup-database.service
+      mode: 0755
+      contents:
+        local: services/nextcloud/backup-database.service
+      user:
+        name: nextcloud
+      group:
+        name: nextcloud
+    - path: /var/home/nextcloud/.config/systemd/user/backup-database.timer
+      mode: 0755
+      contents:
+        local: services/nextcloud/backup-database.timer
+      user:
+        name: nextcloud
+      group:
+        name: nextcloud
     - path: /var/home/nextcloud/.config/systemd/user/pre-generate-preview.service
       mode: 0755
       contents:
diff --git a/users/nginx.bu b/users/nginx.bu
index 759c930..1a740d8 100644
--- a/users/nginx.bu
+++ b/users/nginx.bu
@@ -30,16 +30,34 @@ storage:
         name: nginx
       group:
         name: nginx
+    - path: /var/mnt/nas/containers/nginx/storage/config
+      mode: 0755
+      user:
+        name: nginx
+      group:
+        name: nginx
     - path: /var/mnt/nas/containers/nginx/storage/html
       mode: 0755
       user:
         name: nginx
       group:
         name: nginx
+    - path: /var/mnt/nas/containers/nginx/storage/stream
+      mode: 0755
+      user:
+        name: nginx
+      group:
+        name: nginx
+    - path: /var/mnt/nas/containers/nginx/storage/vhost
+      mode: 0755
+      user:
+        name: nginx
+      group:
+        name: nginx
   files:
     - path: /var/lib/systemd/linger/nginx
       mode: 0644
-    - path: /home/nginx/.config/containers/systemd/user/nginx-acme.container
+    - path: /home/nginx/.config/containers/systemd/nginx-acme.container
       mode: 0644
       contents:
         local: quadlets/nginx/nginx-acme.container
@@ -47,7 +65,7 @@ storage:
         name: nginx
       group:
         name: nginx
-    - path: /home/nginx/.config/containers/systemd/user/nginx-acme.volume
+    - path: /home/nginx/.config/containers/systemd/nginx-acme.volume
       mode: 0644
       contents:
         local: quadlets/nginx/nginx-acme.volume
@@ -55,7 +73,7 @@ storage:
         name: nginx
       group:
         name: nginx
-    - path: /home/nginx/.config/containers/systemd/user/nginx-certs.volume
+    - path: /home/nginx/.config/containers/systemd/nginx-certs.volume
       mode: 0644
       contents:
         local: quadlets/nginx/nginx-certs.volume
@@ -63,7 +81,15 @@ storage:
         name: nginx
       group:
         name: nginx
-    - path: /home/nginx/.config/containers/systemd/user/nginx.container
+    - path: /home/nginx/.config/containers/systemd/nginx-config.volume
+      mode: 0644
+      contents:
+        local: quadlets/nginx/nginx-config.volume
+      user:
+        name: nginx
+      group:
+        name: nginx
+    - path: /home/nginx/.config/containers/systemd/nginx.container
       mode: 0644
       contents:
         local: quadlets/nginx/nginx.container
@@ -71,7 +97,7 @@ storage:
         name: nginx
       group:
         name: nginx
-    - path: /home/nginx/.config/containers/systemd/user/nginx-html.volume
+    - path: /home/nginx/.config/containers/systemd/nginx-html.volume
       mode: 0644
       contents:
         local: quadlets/nginx/nginx-html.volume
@@ -79,11 +105,27 @@ storage:
         name: nginx
       group:
         name: nginx
-    - path: /home/nginx/.config/containers/systemd/user/nginx.pod
+    - path: /home/nginx/.config/containers/systemd/nginx.pod
       mode: 0644
       contents:
         local: quadlets/nginx/nginx.pod
       user:
         name: nginx
+      group:
+        name: nginx
+    - path: /home/nginx/.config/containers/systemd/nginx-stream.volume
+      mode: 0644
+      contents:
+        local: quadlets/nginx/nginx-stream.volume
+      user:
+        name: nginx
+      group:
+        name: nginx
+    - path: /home/nginx/.config/containers/systemd/nginx-vhost.volume
+      mode: 0644
+      contents:
+        local: quadlets/nginx/nginx-vhost.volume
+      user:
+        name: nginx
       group:
         name: nginx
\ No newline at end of file
diff --git a/users/pairdrop.bu b/users/pairdrop.bu
index 5180a78..b6bc8c7 100644
--- a/users/pairdrop.bu
+++ b/users/pairdrop.bu
@@ -21,7 +21,7 @@ storage:
   files:
     - path: /var/lib/systemd/linger/pairdrop
       mode: 0644
-    - path: /home/pairdrop/.config/containers/systemd/user/pairdrop.container
+    - path: /home/pairdrop/.config/containers/systemd/pairdrop.container
       mode: 0644
       contents:
         local: quadlets/pairdrop/pairdrop.container
@@ -29,7 +29,7 @@ storage:
         name: pairdrop
       group:
         name: pairdrop
-    - path: /home/pairdrop/.config/containers/systemd/user/pairdrop.pod
+    - path: /home/pairdrop/.config/containers/systemd/pairdrop.pod
       mode: 0644
       contents:
         local: quadlets/pairdrop/pairdrop.pod
diff --git a/users/paperless.bu b/users/paperless.bu
index 6b43be3..a3eee70 100644
--- a/users/paperless.bu
+++ b/users/paperless.bu
@@ -24,12 +24,6 @@ storage:
         name: paperless
       group:
         name: paperless
-    - path: /var/mnt/nas/containers/paperless/storage/database-data
-      mode: 0755
-      user:
-        name: paperless
-      group:
-        name: paperless
     - path: /var/mnt/nas/containers/paperless/storage/data
       mode: 0755
       user:
@@ -48,16 +42,10 @@ storage:
         name: paperless
       group:
         name: paperless
-    - path: /var/mnt/nas/containers/paperless/storage/redis-data
-      mode: 0755
-      user:
-        name: paperless
-      group:
-        name: paperless
   files:
     - path: /var/lib/systemd/linger/paperless
       mode: 0644
-    - path: /home/paperless/.config/containers/systemd/user/gotenberg.container
+    - path: /home/paperless/.config/containers/systemd/gotenberg.container
       mode: 0644
       contents:
         local: quadlets/paperless/gotenberg.container
@@ -65,7 +53,7 @@ storage:
         name: paperless
       group:
         name: paperless
-    - path: /home/paperless/.config/containers/systemd/user/paperless-consume.volume
+    - path: /home/paperless/.config/containers/systemd/paperless-consume.volume
       mode: 0644
       contents:
         local: quadlets/paperless/paperless-consume.volume
@@ -73,7 +61,7 @@ storage:
         name: paperless
       group:
         name: paperless
-    - path: /home/paperless/.config/containers/systemd/user/paperless.container
+    - path: /home/paperless/.config/containers/systemd/paperless.container
       mode: 0644
       contents:
         local: quadlets/paperless/paperless.container
@@ -81,7 +69,7 @@ storage:
         name: paperless
       group:
         name: paperless
-    - path: /home/paperless/.config/containers/systemd/user/paperless-database.container
+    - path: /home/paperless/.config/containers/systemd/paperless-database.container
       mode: 0644
       contents:
         local: quadlets/paperless/paperless-database.container
@@ -89,7 +77,7 @@ storage:
         name: paperless
       group:
         name: paperless
-    - path: /home/paperless/.config/containers/systemd/user/paperless-database.volume
+    - path: /home/paperless/.config/containers/systemd/paperless-database.volume
       mode: 0644
       contents:
         local: quadlets/paperless/paperless-database.volume
@@ -97,7 +85,7 @@ storage:
         name: paperless
       group:
         name: paperless
-    - path: /home/paperless/.config/containers/systemd/user/paperless-data.volume
+    - path: /home/paperless/.config/containers/systemd/paperless-data.volume
       mode: 0644
       contents:
         local: quadlets/paperless/paperless-data.volume
@@ -105,7 +93,7 @@ storage:
         name: paperless
       group:
         name: paperless
-    - path: /home/paperless/.config/containers/systemd/user/paperless-export.volume
+    - path: /home/paperless/.config/containers/systemd/paperless-export.volume
       mode: 0644
       contents:
         local: quadlets/paperless/paperless-export.volume
@@ -113,7 +101,7 @@ storage:
         name: paperless
       group:
         name: paperless
-    - path: /home/paperless/.config/containers/systemd/user/paperless-media.volume
+    - path: /home/paperless/.config/containers/systemd/paperless-media.volume
       mode: 0644
       contents:
         local: quadlets/paperless/paperless-media.volume
@@ -121,7 +109,7 @@ storage:
         name: paperless
       group:
         name: paperless
-    - path: /home/paperless/.config/containers/systemd/user/paperless.pod
+    - path: /home/paperless/.config/containers/systemd/paperless.pod
       mode: 0644
       contents:
         local: quadlets/paperless/paperless.pod
@@ -129,7 +117,7 @@ storage:
         name: paperless
       group:
         name: paperless
-    - path: /home/paperless/.config/containers/systemd/user/paperless-redis.container
+    - path: /home/paperless/.config/containers/systemd/paperless-redis.container
       mode: 0644
       contents:
         local: quadlets/paperless/paperless-redis.container
@@ -137,7 +125,7 @@ storage:
         name: paperless
       group:
         name: paperless
-    - path: /home/paperless/.config/containers/systemd/user/paperless-redis-data.volume
+    - path: /home/paperless/.config/containers/systemd/paperless-redis-data.volume
       mode: 0644
       contents:
         local: quadlets/paperless/paperless-redis-data.volume
@@ -145,7 +133,7 @@ storage:
         name: paperless
       group:
         name: paperless
-    - path: /home/paperless/.config/containers/systemd/user/tika.container
+    - path: /home/paperless/.config/containers/systemd/tika.container
       mode: 0644
       contents:
         local: quadlets/paperless/tika.container
@@ -159,5 +147,21 @@ storage:
         local: home/paperless/.secrets
       user:
         name: paperless
+      group:
+        name: paperless
+    - path: /var/home/paperless/.config/systemd/user/backup-database.service
+      mode: 0755
+      contents:
+        local: services/paperless/backup-database.service
+      user:
+        name: paperless
+      group:
+        name: paperless
+    - path: /var/home/paperless/.config/systemd/user/backup-database.timer
+      mode: 0755
+      contents:
+        local: services/paperless/backup-database.timer
+      user:
+        name: paperless
       group:
         name: paperless
\ No newline at end of file
diff --git a/users/pihole.bu b/users/pihole.bu
index a181e82..9c96a70 100644
--- a/users/pihole.bu
+++ b/users/pihole.bu
@@ -48,19 +48,13 @@ storage:
         name: pihole
       group:
         name: pihole
-    - path: /var/mnt/nas/containers/pihole/storage/unbound-redis-cache
-      mode: 0755
-      user:
-        name: pihole
-      group:
-        name: pihole
     - path: /var/mnt/nas/containers/pihole/storage/unbound-redis-conf
       mode: 0755
       user:
         name: pihole
       group:
         name: pihole
-    - path: /var/mnt/nas/containers/pihole/storage/unbound-redis-data
+    - path: /var/mnt/nas/containers/pihole/storage/unbound
       mode: 0755
       user:
         name: pihole
@@ -75,7 +69,7 @@ storage:
   files:
     - path: /var/lib/systemd/linger/pihole
       mode: 0644
-    - path: /home/pihole/.config/containers/systemd/user/pihole-config.volume
+    - path: /home/pihole/.config/containers/systemd/pihole-config.volume
       mode: 0644
       contents:
         local: quadlets/pihole/pihole-config.volume
@@ -83,7 +77,7 @@ storage:
         name: pihole
       group:
         name: pihole
-    - path: /home/pihole/.config/containers/systemd/user/pihole.container
+    - path: /home/pihole/.config/containers/systemd/pihole.container
       mode: 0644
       contents:
         local: quadlets/pihole/pihole.container
@@ -91,7 +85,7 @@ storage:
         name: pihole
       group:
         name: pihole
-    - path: /home/pihole/.config/containers/systemd/user/pihole-dnsmasq.volume
+    - path: /home/pihole/.config/containers/systemd/pihole-dnsmasq.volume
       mode: 0644
       contents:
         local: quadlets/pihole/pihole-dnsmasq.volume
@@ -99,7 +93,7 @@ storage:
         name: pihole
       group:
         name: pihole
-    - path: /home/pihole/.config/containers/systemd/user/pihole.network
+    - path: /home/pihole/.config/containers/systemd/pihole.network
       mode: 0644
       contents:
         local: quadlets/pihole/pihole.network
@@ -107,7 +101,7 @@ storage:
         name: pihole
       group:
         name: pihole
-    - path: /home/pihole/.config/containers/systemd/user/pihole.pod
+    - path: /home/pihole/.config/containers/systemd/pihole.pod
       mode: 0644
       contents:
         local: quadlets/pihole/pihole.pod
@@ -115,7 +109,7 @@ storage:
         name: pihole
       group:
         name: pihole
-    - path: /home/pihole/.config/containers/systemd/user/unbound-conf.volume
+    - path: /home/pihole/.config/containers/systemd/unbound-conf.volume
       mode: 0644
       contents:
         local: quadlets/pihole/unbound-conf.volume
@@ -123,7 +117,7 @@ storage:
         name: pihole
       group:
         name: pihole
-    - path: /home/pihole/.config/containers/systemd/user/unbound.container
+    - path: /home/pihole/.config/containers/systemd/unbound.container
       mode: 0644
       contents:
         local: quadlets/pihole/unbound.container
@@ -131,7 +125,7 @@ storage:
         name: pihole
       group:
         name: pihole
-    - path: /home/pihole/.config/containers/systemd/user/unbound-iana.volume
+    - path: /home/pihole/.config/containers/systemd/unbound-iana.volume
       mode: 0644
       contents:
         local: quadlets/pihole/unbound-iana.volume
@@ -139,7 +133,7 @@ storage:
         name: pihole
       group:
         name: pihole
-    - path: /home/pihole/.config/containers/systemd/user/unbound-log.volume
+    - path: /home/pihole/.config/containers/systemd/unbound-log.volume
       mode: 0644
       contents:
         local: quadlets/pihole/unbound-log.volume
@@ -147,7 +141,7 @@ storage:
         name: pihole
       group:
         name: pihole
-    - path: /home/pihole/.config/containers/systemd/user/unbound-redis-cache.volume
+    - path: /home/pihole/.config/containers/systemd/unbound-redis-cache.volume
       mode: 0644
       contents:
         local: quadlets/pihole/unbound-redis-cache.volume
@@ -155,7 +149,7 @@ storage:
         name: pihole
       group:
         name: pihole
-    - path: /home/pihole/.config/containers/systemd/user/unbound-redis-conf.volume
+    - path: /home/pihole/.config/containers/systemd/unbound-redis-conf.volume
       mode: 0644
       contents:
         local: quadlets/pihole/unbound-redis-conf.volume
@@ -163,7 +157,7 @@ storage:
         name: pihole
       group:
         name: pihole
-    - path: /home/pihole/.config/containers/systemd/user/unbound-redis.container
+    - path: /home/pihole/.config/containers/systemd/unbound-redis.container
       mode: 0644
       contents:
         local: quadlets/pihole/unbound-redis.container
@@ -171,7 +165,7 @@ storage:
         name: pihole
       group:
         name: pihole
-    - path: /home/pihole/.config/containers/systemd/user/unbound-redis-data.volume
+    - path: /home/pihole/.config/containers/systemd/unbound-redis-data.volume
       mode: 0644
       contents:
         local: quadlets/pihole/unbound-redis-data.volume
@@ -179,7 +173,7 @@ storage:
         name: pihole
       group:
         name: pihole
-    - path: /home/pihole/.config/containers/systemd/user/unbound-redis-socket.container
+    - path: /home/pihole/.config/containers/systemd/unbound-redis-socket.container
       mode: 0644
       contents:
         local: quadlets/pihole/unbound-redis-socket.container
@@ -187,7 +181,15 @@ storage:
         name: pihole
       group:
         name: pihole
-    - path: /home/pihole/.config/containers/systemd/user/unbound-zones.volume
+    - path: /home/pihole/.config/containers/systemd/unbound.volume
+      mode: 0644
+      contents:
+        local: quadlets/pihole/unbound.volume
+      user:
+        name: pihole
+      group:
+        name: pihole
+    - path: /home/pihole/.config/containers/systemd/unbound-zones.volume
       mode: 0644
       contents:
         local: quadlets/pihole/unbound-zones.volume
diff --git a/users/qbittorrent.bu b/users/qbittorrent.bu
index 44be5a4..8127bf8 100644
--- a/users/qbittorrent.bu
+++ b/users/qbittorrent.bu
@@ -33,7 +33,7 @@ storage:
   files:
     - path: /var/lib/systemd/linger/qbittorrent
       mode: 0644
-    - path: /home/qbittorrent/.config/containers/systemd/user/gluetun.container
+    - path: /home/qbittorrent/.config/containers/systemd/gluetun.container
       mode: 0644
       contents:
         local: quadlets/qbittorrent/gluetun.container
@@ -41,7 +41,7 @@ storage:
         name: qbittorrent
       group:
         name: qbittorrent
-    - path: /home/qbittorrent/.config/containers/systemd/user/qbittorrent-config.volume
+    - path: /home/qbittorrent/.config/containers/systemd/qbittorrent-config.volume
       mode: 0644
       contents:
         local: quadlets/qbittorrent/qbittorrent-config.volume
@@ -49,7 +49,7 @@ storage:
         name: qbittorrent
       group:
         name: qbittorrent
-    - path: /home/qbittorrent/.config/containers/systemd/user/qbittorrent.container
+    - path: /home/qbittorrent/.config/containers/systemd/qbittorrent.container
       mode: 0644
       contents:
         local: quadlets/qbittorrent/qbittorrent.container
@@ -57,7 +57,7 @@ storage:
         name: qbittorrent
       group:
         name: qbittorrent
-    - path: /home/qbittorrent/.config/containers/systemd/user/qbittorrent-downloads.volume
+    - path: /home/qbittorrent/.config/containers/systemd/qbittorrent-downloads.volume
       mode: 0644
       contents:
         local: quadlets/qbittorrent/qbittorrent-downloads.volume
@@ -65,7 +65,7 @@ storage:
         name: qbittorrent
       group:
         name: qbittorrent
-    - path: /home/qbittorrent/.config/containers/systemd/user/qbittorrent.pod
+    - path: /home/qbittorrent/.config/containers/systemd/qbittorrent.pod
       mode: 0644
       contents:
         local: quadlets/qbittorrent/qbittorrent.pod
diff --git a/users/synapse.bu b/users/synapse.bu
index c0130ee..101c1f9 100644
--- a/users/synapse.bu
+++ b/users/synapse.bu
@@ -18,12 +18,6 @@ storage:
       group:
         name: synapse
 
-    - path: /var/mnt/nas/containers/synapse/storage/database-data
-      mode: 0755
-      user:
-        name: synapse
-      group:
-        name: synapse
     - path: /var/mnt/nas/containers/synapse/storage/data
       mode: 0755
       user:
@@ -45,7 +39,7 @@ storage:
   files:
     - path: /var/lib/systemd/linger/synapse
       mode: 0644
-    - path: /home/synapse/.config/containers/systemd/user/synapse.container
+    - path: /home/synapse/.config/containers/systemd/synapse.container
       mode: 0644
       contents:
         local: quadlets/synapse/synapse.container
@@ -53,7 +47,7 @@ storage:
         name: synapse
       group:
         name: synapse
-    - path: /home/synapse/.config/containers/systemd/user/synapse-database.container
+    - path: /home/synapse/.config/containers/systemd/synapse-database.container
       mode: 0644
       contents:
         local: quadlets/synapse/synapse-database.container
@@ -61,7 +55,7 @@ storage:
         name: synapse
       group:
         name: synapse
-    - path: /home/synapse/.config/containers/systemd/user/synapse-database.volume
+    - path: /home/synapse/.config/containers/systemd/synapse-database.volume
       mode: 0644
       contents:
         local: quadlets/synapse/synapse-database.volume
@@ -69,7 +63,7 @@ storage:
         name: synapse
       group:
         name: synapse
-    - path: /home/synapse/.config/containers/systemd/user/synapse-data.volume
+    - path: /home/synapse/.config/containers/systemd/synapse-data.volume
       mode: 0644
       contents:
         local: quadlets/synapse/synapse-data.volume
@@ -77,7 +71,7 @@ storage:
         name: synapse
       group:
         name: synapse
-    - path: /home/synapse/.config/containers/systemd/user/synapse-mautrix.volume
+    - path: /home/synapse/.config/containers/systemd/synapse-mautrix.volume
       mode: 0644
       contents:
         local: quadlets/synapse/synapse-mautrix.volume
@@ -85,7 +79,7 @@ storage:
         name: synapse
       group:
         name: synapse
-    - path: /home/synapse/.config/containers/systemd/user/synapse-media.volume
+    - path: /home/synapse/.config/containers/systemd/synapse-media.volume
       mode: 0644
       contents:
         local: quadlets/synapse/synapse-media.volume
@@ -93,7 +87,7 @@ storage:
         name: synapse
       group:
         name: synapse
-    - path: /home/synapse/.config/containers/systemd/user/synapse.pod
+    - path: /home/synapse/.config/containers/systemd/synapse.pod
       mode: 0644
       contents:
         local: quadlets/synapse/synapse.pod
@@ -107,5 +101,21 @@ storage:
         local: home/synapse/.secrets
       user:
         name: synapse
+      group:
+        name: synapse
+    - path: /var/home/synapse/.config/systemd/user/backup-database.service
+      mode: 0755
+      contents:
+        local: services/synapse/backup-database.service
+      user:
+        name: synapse
+      group:
+        name: synapse
+    - path: /var/home/synapse/.config/systemd/user/backup-database.timer
+      mode: 0755
+      contents:
+        local: services/synapse/backup-database.timer
+      user:
+        name: synapse
       group:
         name: synapse
\ No newline at end of file
diff --git a/users/wallabag.bu b/users/wallabag.bu
index 19f8c26..b6ce15d 100644
--- a/users/wallabag.bu
+++ b/users/wallabag.bu
@@ -18,7 +18,7 @@ storage:
       group:
         name: wallabag
 
-    - path: /var/mnt/nas/containers/wallabag/storage/database
+    - path: /var/mnt/nas/containers/wallabag/storage/data
       mode: 0755
       user:
         name: wallabag
@@ -33,7 +33,7 @@ storage:
   files:
     - path: /var/lib/systemd/linger/wallabag
       mode: 0644
-    - path: /home/wallabag/.config/containers/systemd/user/wallabag.container
+    - path: /home/wallabag/.config/containers/systemd/wallabag.container
       mode: 0644
       contents:
         local: quadlets/wallabag/wallabag.container
@@ -41,7 +41,7 @@ storage:
         name: wallabag
       group:
         name: wallabag
-    - path: /home/wallabag/.config/containers/systemd/user/wallabag-database.container
+    - path: /home/wallabag/.config/containers/systemd/wallabag-database.container
       mode: 0644
       contents:
         local: quadlets/wallabag/wallabag-database.container
@@ -49,7 +49,7 @@ storage:
         name: wallabag
       group:
         name: wallabag
-    - path: /home/wallabag/.config/containers/systemd/user/wallabag-database.volume
+    - path: /home/wallabag/.config/containers/systemd/wallabag-database.volume
       mode: 0644
       contents:
         local: quadlets/wallabag/wallabag-database.volume
@@ -57,7 +57,15 @@ storage:
         name: wallabag
       group:
         name: wallabag
-    - path: /home/wallabag/.config/containers/systemd/user/wallabag-images.volume
+    - path: /home/wallabag/.config/containers/systemd/wallabag-data.volume
+      mode: 0644
+      contents:
+        local: quadlets/wallabag/wallabag-data.volume
+      user:
+        name: wallabag
+      group:
+        name: wallabag
+    - path: /home/wallabag/.config/containers/systemd/wallabag-images.volume
       mode: 0644
       contents:
         local: quadlets/wallabag/wallabag-images.volume
@@ -65,7 +73,7 @@ storage:
         name: wallabag
       group:
         name: wallabag
-    - path: /home/wallabag/.config/containers/systemd/user/wallabag.pod
+    - path: /home/wallabag/.config/containers/systemd/wallabag.pod
       mode: 0644
       contents:
         local: quadlets/wallabag/wallabag.pod
@@ -73,7 +81,7 @@ storage:
         name: wallabag
       group:
         name: wallabag
-    - path: /home/wallabag/.config/containers/systemd/user/wallabag-redis.container
+    - path: /home/wallabag/.config/containers/systemd/wallabag-redis.container
       mode: 0644
       contents:
         local: quadlets/wallabag/wallabag-redis.container
@@ -81,11 +89,35 @@ storage:
         name: wallabag
       group:
         name: wallabag
+    - path: /var/home/wallabag/custom-entrypoint.sh
+      mode: 0755
+      contents:
+        local: home/wallabag/custom-entrypoint.sh
+      user:
+        name: wallabag
+      group:
+        name: wallabag
     - path: /var/home/wallabag/.secrets
       mode: 0755
       contents:
         local: home/wallabag/.secrets
       user:
         name: wallabag
+      group:
+        name: wallabag
+    - path: /var/home/wallabag/.config/systemd/user/backup-database.service
+      mode: 0755
+      contents:
+        local: services/wallabag/backup-database.service
+      user:
+        name: wallabag
+      group:
+        name: wallabag
+    - path: /var/home/wallabag/.config/systemd/user/backup-database.timer
+      mode: 0755
+      contents:
+        local: services/wallabag/backup-database.timer
+      user:
+        name: wallabag
       group:
         name: wallabag
\ No newline at end of file