diff --git a/compose.yml b/compose.yml
index e52093d..343afc1 100644
--- a/compose.yml
+++ b/compose.yml
@@ -11,7 +11,7 @@ services:
       - CIVICRM_DB_NAME=civicrm
       - CIVICRM_DB_USER=civicrm
       - CIVICRM_DB_PASS_FILE=/run/secrets/db_password
-      - CIVICRM_DB_HOST=db-civicrm
+      - CIVICRM_DB_HOST=civicrm-db
       - CIVICRM_DB_PORT=3306
       - WORDPRESS_DB_NAME=wordpress
       - WORDPRESS_DB_USER=wordpress
@@ -29,9 +29,7 @@ services:
       - civicrm_sign_key
       - smtp_password
     volumes:
-      - uploads:/var/www/html/wp-content/uploads
-      # - ./.bash_history:/home/civicrm/.bash_history
-      # - ./state:/state
+      - data:/var/www/html/wp-content/uploads
     networks:
       - default
       - proxy
@@ -58,6 +56,8 @@ services:
         #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
         #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
         - "coop-cloud.${STACK_NAME}.version="
+        - "backupbot.backup=true"
+        - "backupbot.backup.path=/var/www/html/wp-content/uploads"
     healthcheck:
       test: ["CMD", "cv", "api", "system.get"]
       interval: 30s
@@ -65,7 +65,6 @@ services:
       retries: 10
       start_period: 10s
 
-
   db:
     image: "mariadb:10.8"
     volumes:
@@ -78,25 +77,28 @@ services:
     secrets:
       - db_password
       - db_root_password
-    # deploy:
-    #   labels:
-    #     backupbot.backup: "true"
-    #     backupbot.backup.path: "/tmp/dump.sql.gz"
-    #     backupbot.backup.pre-hook: "sh -c 'mysqldump --single-transaction -u root -p\"$$(cat /run/secrets/db_root_password)\" wordpress | gzip > /tmp/dump.sql.gz'"
-    #     backupbot.backup.post-hook: "rm -f /tmp/dump.sql.gz"
-    #     backupbot.restore: "true"
-    #     backupbot.restore.post-hook: "sh -c 'mysql -u root -p\"$$(cat /run/secrets/db_root_password)\" wordpress < /tmp/dbdump.sql && rm -f /tmp/dbdump.sql'"
     healthcheck:
       test: ["CMD-SHELL", 'mysqladmin -p"$$(cat /run/secrets/db_root_password)"  ping']
       interval: 30s
       timeout: 10s
       retries: 10
       start_period: 1m
+    deploy:
+      restart_policy:
+        condition: on-failure
+      labels:
+        backupbot.backup: "true"
+        backupbot.backup.path: "/tmp/dump.sql"
+        backupbot.backup.pre-hook: "sh -c 'mysqldump --single-transaction -u root -p\"$$(cat /run/secrets/db_root_password)\" wordpress > /tmp/dump.sql'"
+        backupbot.backup.post-hook: "rm -f /tmp/dump.sql"
+        backupbot.restore: "true"
+        backupbot.restore.post-hook: "sh -c 'mysql -u root -p\"$$(cat /run/secrets/db_root_password)\" wordpress < /tmp/dump.sql && rm -f /tmp/dump.sql'"
 
-  db-civicrm:
+
+  civicrm-db:
     image: "mariadb:10.8"
     volumes:
-      - "db-civicrm:/var/lib/mysql"
+      - "civicrm-db:/var/lib/mysql"
     environment:
       - MYSQL_DATABASE=civicrm
       - MYSQL_USER=civicrm
@@ -111,6 +113,16 @@ services:
       timeout: 10s
       retries: 10
       start_period: 1m
+    deploy:
+      restart_policy:
+        condition: on-failure
+      labels:
+        backupbot.backup: "true"
+        backupbot.backup.path: "/tmp/dump.sql"
+        backupbot.backup.pre-hook: "sh -c 'mysqldump --single-transaction -u root -p\"$$(cat /run/secrets/db_root_password)\" civicrm > /tmp/dump.sql'"
+        backupbot.backup.post-hook: "rm -f /tmp/dump.sql"
+        backupbot.restore: "true"
+        backupbot.restore.post-hook: "sh -c 'mysql -u root -p\"$$(cat /run/secrets/db_root_password)\" civicrm < /tmp/dump.sql && rm -f /tmp/dump.sql'"
 
 networks:
   proxy:
@@ -118,8 +130,8 @@ networks:
 
 volumes:
   mariadb:
-  db-civicrm:
-  uploads:
+  civicrm-db:
+  data:
 
 configs:
   apache-sites-available-conf: