diff --git a/beeper/etc/containers/systemd/mastodon/mastodon-darkhttpd.container b/beeper/etc/containers/systemd/mastodon/mastodon-darkhttpd.container
index 9b5b2a6..704e83d 100644
--- a/beeper/etc/containers/systemd/mastodon/mastodon-darkhttpd.container
+++ b/beeper/etc/containers/systemd/mastodon/mastodon-darkhttpd.container
@@ -4,9 +4,10 @@ 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=192.168.1.73:42261:80
+PublishPort=127.0.0.1:42261:80
 Volume=/var/containers/mastodon/public/system:/mastodon/public/system:z
 
 [Service]
diff --git a/beeper/etc/containers/systemd/mastodon/mastodon-dfdb.container b/beeper/etc/containers/systemd/mastodon/mastodon-dfdb.container
index d65e01a..58d4f4d 100644
--- a/beeper/etc/containers/systemd/mastodon/mastodon-dfdb.container
+++ b/beeper/etc/containers/systemd/mastodon/mastodon-dfdb.container
@@ -4,7 +4,8 @@ Description=Mastodon Dragonfly DB
 [Container]
 ContainerName=mastodon-dfdb
 Image=docker.dragonflydb.io/dragonflydb/dragonfly
-Environment=DFLY_snapshot_cron=* * * * *
+ContainerName=mastodon-dfdb
+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/mastodon/mastodon-ingress.container b/beeper/etc/containers/systemd/mastodon/mastodon-ingress.container
index c8db14e..bb370bc 100644
--- a/beeper/etc/containers/systemd/mastodon/mastodon-ingress.container
+++ b/beeper/etc/containers/systemd/mastodon/mastodon-ingress.container
@@ -6,6 +6,7 @@ After=postgresql.service mastodon-dfdb.service
 [Container]
 ContainerName=mastodon-ingress
 Image=ghcr.io/synth-download/mastodon-ingress:nightly
+ContainerName=mastodon-ingress
 EnvironmentFile=/var/containers/mastodon/.env.secrets
 EnvironmentFile=/var/containers/mastodon/.env
 Network=mastodon.network
diff --git a/beeper/etc/containers/systemd/mastodon/mastodon-sidekiq.container b/beeper/etc/containers/systemd/mastodon/mastodon-sidekiq.container
index e36c80f..ab1d3a3 100644
--- a/beeper/etc/containers/systemd/mastodon/mastodon-sidekiq.container
+++ b/beeper/etc/containers/systemd/mastodon/mastodon-sidekiq.container
@@ -6,6 +6,7 @@ After=postgresql.service mastodon-dfdb.service
 [Container]
 ContainerName=mastodon-sidekiq
 Image=ghcr.io/synth-download/mastodon:nightly
+ContainerName=mastodon-sidekiq
 EnvironmentFile=/var/containers/mastodon/.env.secrets
 EnvironmentFile=/var/containers/mastodon/.env
 Exec=bundle exec sidekiq
diff --git a/beeper/etc/containers/systemd/mastodon/mastodon-streaming.container b/beeper/etc/containers/systemd/mastodon/mastodon-streaming.container
index d6eed33..354534f 100644
--- a/beeper/etc/containers/systemd/mastodon/mastodon-streaming.container
+++ b/beeper/etc/containers/systemd/mastodon/mastodon-streaming.container
@@ -6,13 +6,14 @@ After=postgresql.service mastodon-dfdb.service
 [Container]
 ContainerName=mastodon-streaming
 Image=ghcr.io/synth-download/mastodon-streaming:nightly
+ContainerName=mastodon-streaming
 EnvironmentFile=/var/containers/mastodon/.env.secrets
 EnvironmentFile=/var/containers/mastodon/.env
 Exec=node ./streaming/index.js
 HealthCmd=curl -s --noproxy localhost localhost:4000/api/v1/streaming/health | grep -q 'OK' || exit 1
 Network=mastodon.network
 Network=postgresql.network
-PublishPort=192.168.1.73:58834:4000
+PublishPort=127.0.0.1:58834:4000
 
 [Service]
 Restart=always
diff --git a/beeper/etc/containers/systemd/mastodon/mastodon-web.container b/beeper/etc/containers/systemd/mastodon/mastodon-web.container
index f7e05bf..aa6ed0a 100644
--- a/beeper/etc/containers/systemd/mastodon/mastodon-web.container
+++ b/beeper/etc/containers/systemd/mastodon/mastodon-web.container
@@ -6,13 +6,14 @@ After=postgresql.service mastodon-dfdb.service
 [Container]
 ContainerName=mastodon-web
 Image=ghcr.io/synth-download/mastodon:nightly
+ContainerName=mastodon-web
 EnvironmentFile=/var/containers/mastodon/.env.secrets
 EnvironmentFile=/var/containers/mastodon/.env
 Exec=bundle exec puma -C config/puma.rb
 HealthCmd=curl -s --noproxy localhost localhost:3000/health | grep -q 'OK' || exit 1
 Network=mastodon.network
 Network=postgresql.network
-PublishPort=192.168.1.73:46098:3000
+PublishPort=127.0.0.1:46098:3000
 Volume=/var/containers/mastodon/public/system:/mastodon/public/system:z
 Volume=/var/containers/mastodon/init/disable_ssl.rb:/mastodon/config/initializers/disable_ssl.rb:ro,z
 Volume=/var/containers/mastodon/shared:/shared:z
diff --git a/beeper/etc/containers/systemd/mastodon/mastodon.network b/beeper/etc/containers/systemd/mastodon/mastodon.network
index fc45553..b245ebd 100644
--- a/beeper/etc/containers/systemd/mastodon/mastodon.network
+++ b/beeper/etc/containers/systemd/mastodon/mastodon.network
@@ -1,3 +1,3 @@
 [Network]
 NetworkName=mastodon
-IPv6=true
\ No newline at end of file
+IPv6=true
diff --git a/beeper/etc/containers/systemd/postgresql/postgresql.container b/beeper/etc/containers/systemd/postgresql/postgresql.container
index 99f44c5..f73416c 100644
--- a/beeper/etc/containers/systemd/postgresql/postgresql.container
+++ b/beeper/etc/containers/systemd/postgresql/postgresql.container
@@ -4,6 +4,7 @@ Description=PostgreSQL Database
 [Container]
 ContainerName=postgresql
 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
@@ -11,8 +12,8 @@ HealthInterval=40s
 HealthTimeout=3s
 HealthRetries=20
 UserNS=keep-id:uid=999,gid=999
-Volume=/var/containers/postgresql/db:/var/lib/postgresql/data:z,U
-Volume=/var/containers/postgresql/exp:/mnt/exp:z,U
+Volume=/var/containers/postgresql/db:/var/lib/postgresql/data:z
+Volume=/var/containers/postgresql/exp:/mnt/exp:z
 
 [Service]
 Restart=always
diff --git a/beeper/etc/containers/systemd/sharkey/sharkey.network b/beeper/etc/containers/systemd/sharkey/sharkey.network
index f20df48..e8b6107 100644
--- a/beeper/etc/containers/systemd/sharkey/sharkey.network
+++ b/beeper/etc/containers/systemd/sharkey/sharkey.network
@@ -1,3 +1,3 @@
 [Network]
 NetworkName=sharkey
-IPv6=true
\ No newline at end of file
+IPv6=true
diff --git a/beeper/etc/containers/systemd/yggdrasil/yggdrasil.container b/beeper/etc/containers/systemd/yggdrasil/yggdrasil.container
index a52cd1e..07a236c 100644
--- a/beeper/etc/containers/systemd/yggdrasil/yggdrasil.container
+++ b/beeper/etc/containers/systemd/yggdrasil/yggdrasil.container
@@ -5,6 +5,7 @@ Wants=network-online.target
 
 [Container]
 Image=ghcr.io/yggdrasil-network/yggstack:trunk
+ContainerName=yggdrasil
 AutoUpdate=registry
 Exec=-useconffile /etc/yggdrasil/yggdrasil.conf -remote-tcp 22:22 -remote-tcp 80:80 -remote-udp 80:80
 Network=host