diff --git a/beeper/etc/containers/systemd/sharkey-activity.container b/beeper/etc/containers/systemd/sharkey-activity.container
index cefd9b8..f9858a4 100644
--- a/beeper/etc/containers/systemd/sharkey-activity.container
+++ b/beeper/etc/containers/systemd/sharkey-activity.container
@@ -1,16 +1,26 @@
 [Unit]
 Description=Sharkey's ActivityPub Federation service
+Requires=sharkey-dfdb.service
+After=sharkey-dfdb.service
 
 [Container]
-Environment=MISSKEY_CONFIG_YML=*.yml MISSKEY_CONFIG_DIR=/sharkey/.config MK_ONLY_SERVER=1 MK_DISABLE_CLUSTERING=1 MK_NO_DAEMONS=1
-EnvironmentFile=/var/containers/sharkey/.env.secrets
 Image=registry.activitypub.software/transfem-org/sharkey:develop
-Network=postgresql
-Network=sharkey
+Environment=MISSKEY_CONFIG_YML=*.yml
+Environment=MISSKEY_CONFIG_DIR=/sharkey/.config
+Environment=MK_ONLY_SERVER=1
+Environment=MK_DISABLE_CLUSTERING=1
+Environment=MK_NO_DAEMONS=1
+EnvironmentFile=/var/containers/sharkey/.env.secrets
+Network=postgresql.network
+Network=sharkey.network
 PublishPort=192.168.1.73:47815:3002
-Volume=/var/containers/sharkey/files:/sharkey/files:Z
-Volume=/var/containers/sharkey/activity:/sharkey/.config:Z
-Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:Z
+Volume=/var/containers/sharkey/files:/sharkey/files:z
+Volume=/var/containers/sharkey/activity:/sharkey/.config:z
+Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro: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-api.container b/beeper/etc/containers/systemd/sharkey-api.container
index 7e584ef..ad77dfc 100644
--- a/beeper/etc/containers/systemd/sharkey-api.container
+++ b/beeper/etc/containers/systemd/sharkey-api.container
@@ -1,16 +1,25 @@
 [Unit]
 Description=Sharkey's API and Web service
+Requires=sharkey-dfdb.service
+After=sharkey-dfdb.service
 
 [Container]
-Environment=MISSKEY_CONFIG_YML=*.yml MISSKEY_CONFIG_DIR=/sharkey/.config MK_ONLY_SERVER=1 MK_DISABLE_CLUSTERING=1
-EnvironmentFile=/var/containers/sharkey/.env.secrets
 Image=registry.activitypub.software/transfem-org/sharkey:develop
-Network=postgresql
-Network=sharkey
+Environment=MISSKEY_CONFIG_YML=*.yml
+Environment=MISSKEY_CONFIG_DIR=/sharkey/.config
+Environment=MK_ONLY_SERVER=1
+Environment=MK_DISABLE_CLUSTERING=1
+EnvironmentFile=/var/containers/sharkey/.env.secrets
+Network=postgresql.network
+Network=sharkey.network
 PublishPort=192.168.1.73:60628:3001
-Volume=/var/containers/sharkey/files:/sharkey/files:Z
-Volume=/var/containers/sharkey/api:/sharkey/.config:Z
-Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:Z
+Volume=/var/containers/sharkey/files:/sharkey/files:z
+Volume=/var/containers/sharkey/api:/sharkey/.config:z
+Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro: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-dfdb.container b/beeper/etc/containers/systemd/sharkey-dfdb.container
index 26f9b11..717fafe 100644
--- a/beeper/etc/containers/systemd/sharkey-dfdb.container
+++ b/beeper/etc/containers/systemd/sharkey-dfdb.container
@@ -4,8 +4,12 @@ Description=Sharkey's DragonflyDB process
 [Container]
 Environment="DFLY_snapshot_cron=* * * * *" DFLY_version_check=false DFLY_default_lua_flags=allow-undeclared-keys DFLY_dbfilename=dump.rdb DFLY_df_snapshot_format=false DFLY_dir=/data
 Image=docker.dragonflydb.io/dragonflydb/dragonfly
-Network=sharkey
+Network=sharkey.network
 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 3e182f5..3dfb6fb 100644
--- a/beeper/etc/containers/systemd/sharkey-media.container
+++ b/beeper/etc/containers/systemd/sharkey-media.container
@@ -1,16 +1,26 @@
 [Unit]
 Description=Sharkey's Media service
+Requires=sharkey-dfdb.service
+After=sharkey-dfdb.service
 
 [Container]
-Environment=MISSKEY_CONFIG_YML=*.yml MISSKEY_CONFIG_DIR=/sharkey/.config MK_ONLY_SERVER=1 MK_DISABLE_CLUSTERING=1 MK_NO_DAEMONS=1
-EnvironmentFile=/var/containers/sharkey/.env.secrets
 Image=registry.activitypub.software/transfem-org/sharkey:develop
-Network=postgresql
-Network=sharkey
+Environment=MISSKEY_CONFIG_YML=*.yml
+Environment=MISSKEY_CONFIG_DIR=/sharkey/.config
+Environment=MK_ONLY_SERVER=1
+Environment=MK_DISABLE_CLUSTERING=1
+Environment=MK_NO_DAEMONS=1
+EnvironmentFile=/var/containers/sharkey/.env.secrets
+Network=postgresql.network
+Network=sharkey.network
 PublishPort=192.168.1.73:57378:3003
-Volume=/var/containers/sharkey/files:/sharkey/files:Z
-Volume=/var/containers/sharkey/media:/sharkey/.config:Z
-Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:Z
+Volume=/var/containers/sharkey/files:/sharkey/files:z
+Volume=/var/containers/sharkey/media:/sharkey/.config:z
+Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro: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-worker.container b/beeper/etc/containers/systemd/sharkey-worker.container
index 0426a66..5a18e3a 100644
--- a/beeper/etc/containers/systemd/sharkey-worker.container
+++ b/beeper/etc/containers/systemd/sharkey-worker.container
@@ -1,15 +1,23 @@
 [Unit]
 Description=Sharkey's Worker service
+Requires=sharkey-dfdb.service
+After=sharkey-dfdb.service
 
 [Container]
-Environment=MISSKEY_CONFIG_YML=*.yml MISSKEY_CONFIG_DIR=/sharkey/.config MK_ONLY_QUEUE=1
-EnvironmentFile=/var/containers/sharkey/.env.secrets
 Image=registry.activitypub.software/transfem-org/sharkey:develop
-Network=postgresql
-Network=sharkey
-Volume=/var/containers/sharkey/files:/sharkey/files:Z
-Volume=/var/containers/sharkey/worker:/sharkey/.config:Z
-Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:Z
+Environment=MISSKEY_CONFIG_YML=*.yml
+Environment=MISSKEY_CONFIG_DIR=/sharkey/.config
+Environment=MK_ONLY_QUEUE=1
+EnvironmentFile=/var/containers/sharkey/.env.secrets
+Network=postgresql.network
+Network=sharkey.network
+Volume=/var/containers/sharkey/files:/sharkey/files:z
+Volume=/var/containers/sharkey/worker:/sharkey/.config:z
+Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:z
 
 [Service]
-Restart=always
\ No newline at end of file
+Restart=always
+RestartSec=10s
+
+[Install]
+WantedBy=default.target