diff --git a/.gitignore b/.gitignore
index 6ed3c56..db8d830 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /venv
 gitea.env
+/data
diff --git a/simple/docker-compose.yml b/simple/docker-compose.yml
index 91c391a..84bba2a 100644
--- a/simple/docker-compose.yml
+++ b/simple/docker-compose.yml
@@ -33,6 +33,11 @@ services:
       - buildbot-worker
     volumes:
       - buildbot-docs:/buildbot_share/docs/:rw
+    deploy:
+      restart_policy:
+        condition: unless-stopped
+        delay: 30s
+        window: 300s
 
   db:
     env_file:
@@ -42,6 +47,13 @@ services:
       - 5432
     networks:
       - buildbot-db
+    volumes:
+      - ../data/db:/var/lib/postgresql/data
+    deploy:
+      restart_policy:
+        condition: unless-stopped
+        delay: 30s
+        window: 300s
 
   rust-worker-1-65:
     build:
@@ -56,6 +68,11 @@ services:
       WORKER_ENVIRONMENT_BLACKLIST: DOCKER_BUILDBOT* BUILDBOT_ENV_* BUILDBOT_1* WORKER_ENVIRONMENT_BLACKLIST
     networks:
       - buildbot-worker
+    deploy:
+      restart_policy:
+        condition: unless-stopped
+        delay: 30s
+        window: 300s
 
   rust-worker-1-72:
     build:
@@ -70,6 +87,11 @@ services:
       WORKER_ENVIRONMENT_BLACKLIST: DOCKER_BUILDBOT* BUILDBOT_ENV_* BUILDBOT_1* WORKER_ENVIRONMENT_BLACKLIST
     networks:
       - buildbot-worker
+    deploy:
+      restart_policy:
+        condition: unless-stopped
+        delay: 30s
+        window: 300s
 
   rust-worker-mdbook:
     build:
@@ -83,6 +105,11 @@ services:
       WORKER_ENVIRONMENT_BLACKLIST: DOCKER_BUILDBOT* BUILDBOT_ENV_* BUILDBOT_1* WORKER_ENVIRONMENT_BLACKLIST
     networks:
       - buildbot-worker
+    deploy:
+      restart_policy:
+        condition: unless-stopped
+        delay: 30s
+        window: 300s
 
   nginx:
     container_name: buildbot-nginx
@@ -93,3 +120,8 @@ services:
       v6d: {}
     volumes:
       - buildbot-docs:/buildbot_share/docs/:ro
+    deploy:
+      restart_policy:
+        condition: unless-stopped
+        delay: 30s
+        window: 300s