diff --git a/beeper/etc/containers/systemd/mastodon/mastodon-darkhttpd.container b/beeper/etc/containers/systemd/mastodon/mastodon-darkhttpd.container
index 8b81d34..704e83d 100644
--- a/beeper/etc/containers/systemd/mastodon/mastodon-darkhttpd.container
+++ b/beeper/etc/containers/systemd/mastodon/mastodon-darkhttpd.container
@@ -4,7 +4,7 @@ After=network-online.target
 Wants=network-online.target
 
 [Container]
-Image=p3terx/darkhttpd
+Image=registry.hub.docker.com/p3terx/darkhttpd
 ContainerName=mastodon-darkhttpd
 Exec=/mastodon/public/system
 PublishPort=127.0.0.1:42261:80
diff --git a/beeper/etc/containers/systemd/mastodon/mastodon-dfdb.container b/beeper/etc/containers/systemd/mastodon/mastodon-dfdb.container
index 92e1c21..d6dde0a 100644
--- a/beeper/etc/containers/systemd/mastodon/mastodon-dfdb.container
+++ b/beeper/etc/containers/systemd/mastodon/mastodon-dfdb.container
@@ -4,7 +4,7 @@ Description=Mastodon Dragonfly DB
 [Container]
 Image=docker.dragonflydb.io/dragonflydb/dragonfly
 ContainerName=mastodon-dfdb
-Environment=DFLY_snapshot_cron=* * * * *
+Environment=DFLY_snapshot_cron="* * * * *"
 Environment=DFLY_version_check=false
 Environment=DFLY_default_lua_flags=allow-undeclared-keys
 Environment=DFLY_dbfilename=dump.rdb
diff --git a/beeper/etc/containers/systemd/postgresql/postgresql.container b/beeper/etc/containers/systemd/postgresql/postgresql.container
index c287eab..9cfe72e 100644
--- a/beeper/etc/containers/systemd/postgresql/postgresql.container
+++ b/beeper/etc/containers/systemd/postgresql/postgresql.container
@@ -3,6 +3,7 @@ Description=PostgreSQL Database
 
 [Container]
 Image=registry.hub.docker.com/groonga/pgroonga:latest-alpine-18
+ContainerName=postgresql
 EnvironmentFile=/var/containers/postgresql/.env
 Network=postgresql.network
 HealthCmd=pg_isready -U postgres -d postgres