diff --git a/beeper/etc/containers/systemd/sharkey-activity.container b/beeper/etc/containers/systemd/sharkey-activity.container
index 33a6cd2..f9858a4 100644
--- a/beeper/etc/containers/systemd/sharkey-activity.container
+++ b/beeper/etc/containers/systemd/sharkey-activity.container
@@ -1,5 +1,7 @@
 [Unit]
 Description=Sharkey's ActivityPub Federation service
+Requires=sharkey-dfdb.service
+After=sharkey-dfdb.service
 
 [Container]
 Image=registry.activitypub.software/transfem-org/sharkey:develop
@@ -18,3 +20,7 @@ Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:z
 
 [Service]
 Restart=always
+RestartSec=10s
+
+[Install]
+WantedBy=default.target
diff --git a/beeper/etc/containers/systemd/sharkey-api.container b/beeper/etc/containers/systemd/sharkey-api.container
index 7a11b45..ad77dfc 100644
--- a/beeper/etc/containers/systemd/sharkey-api.container
+++ b/beeper/etc/containers/systemd/sharkey-api.container
@@ -1,5 +1,7 @@
 [Unit]
 Description=Sharkey's API and Web service
+Requires=sharkey-dfdb.service
+After=sharkey-dfdb.service
 
 [Container]
 Image=registry.activitypub.software/transfem-org/sharkey:develop
@@ -17,3 +19,7 @@ Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:z
 
 [Service]
 Restart=always
+RestartSec=10s
+
+[Install]
+WantedBy=default.target
diff --git a/beeper/etc/containers/systemd/sharkey-dfdb.container b/beeper/etc/containers/systemd/sharkey-dfdb.container
index 26f9b11..93aa621 100644
--- a/beeper/etc/containers/systemd/sharkey-dfdb.container
+++ b/beeper/etc/containers/systemd/sharkey-dfdb.container
@@ -8,4 +8,8 @@ Network=sharkey
 Volume=/var/containers/sharkey/dfdb:/data:z
 
 [Service]
-Restart=always
\ No newline at end of file
+Restart=always
+RestartSec=10s
+
+[Install]
+WantedBy=default.target
diff --git a/beeper/etc/containers/systemd/sharkey-media.container b/beeper/etc/containers/systemd/sharkey-media.container
index 8df2de6..3dfb6fb 100644
--- a/beeper/etc/containers/systemd/sharkey-media.container
+++ b/beeper/etc/containers/systemd/sharkey-media.container
@@ -1,5 +1,7 @@
 [Unit]
 Description=Sharkey's Media service
+Requires=sharkey-dfdb.service
+After=sharkey-dfdb.service
 
 [Container]
 Image=registry.activitypub.software/transfem-org/sharkey:develop
@@ -18,3 +20,7 @@ Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:z
 
 [Service]
 Restart=always
+RestartSec=10s
+
+[Install]
+WantedBy=default.target
diff --git a/beeper/etc/containers/systemd/sharkey-worker.container b/beeper/etc/containers/systemd/sharkey-worker.container
index 2f7d989..5a18e3a 100644
--- a/beeper/etc/containers/systemd/sharkey-worker.container
+++ b/beeper/etc/containers/systemd/sharkey-worker.container
@@ -1,5 +1,7 @@
 [Unit]
 Description=Sharkey's Worker service
+Requires=sharkey-dfdb.service
+After=sharkey-dfdb.service
 
 [Container]
 Image=registry.activitypub.software/transfem-org/sharkey:develop
@@ -15,3 +17,7 @@ Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:z
 
 [Service]
 Restart=always
+RestartSec=10s
+
+[Install]
+WantedBy=default.target