diff --git a/mastodon-postgresql.service b/mastodon-postgresql.service
index 4291b1b..0e19a66 100644
--- a/mastodon-postgresql.service
+++ b/mastodon-postgresql.service
@@ -10,7 +10,7 @@ RequiresMountsFor=/var/lib/containers/storage /var/run/containers/storage
 Environment=PODMAN_SYSTEMD_UNIT=%n 
 Restart=on-failure
 TimeoutStopSec=70
-ExecStart=/usr/bin/podman run --net internal_network --restart always --shm-size 256mb --health-cmd CMD,pg_isready,-U,postgres -v ./postgres14:/var/lib/postgresql/data -e POSTGRES_HOST_AUTH_METHOD=trust postgres:14 --tag mastodon-postgres
+ExecStart=/usr/bin/podman run --name mastodon-postgresql --net internal_network --restart always --shm-size 256mb --health-cmd CMD,pg_isready,-U,postgres -v mastodon-postgresql:/var/lib/postgresql/data -e POSTGRES_HOST_AUTH_METHOD=trust postgres:14 
 ExecStop=/usr/bin/podman stop mastodon-postgres
 ExecStopPost=/usr/bin/podman rm mastodon-postgres
 Type=oneshot
diff --git a/mastodon-web.service b/mastodon-web.service
index 9f8ed83..62f334b 100644
--- a/mastodon-web.service
+++ b/mastodon-web.service
@@ -10,7 +10,7 @@ RequiresMountsFor=/var/lib/containers/storage /var/run/containers/storage
 Environment=PODMAN_SYSTEMD_UNIT=%n 
 Restart=on-failure
 TimeoutStopSec=70
-ExecStart=/usr/bin/podman run --net external_network --net internal_network --restart always --env-file %h/live/.env.production --health-cmd "CMD-SHELL,wget -q --spider --proxy=off localhost:3000/health || exit 1" -p 127.0.0.1:3000:3000 -v %h/live/public/system localhost/jademoe bundle exec puma -C config/puma.rb --tag mastodon-web
+ExecStart=/usr/bin/podman run --name mastodon-web -net external_network --net internal_network --restart always --env-file %h/live/.env.production --health-cmd "CMD-SHELL,wget -q --spider --proxy=off localhost:3000/health || exit 1" -p 127.0.0.1:3000:3000 -v %h/live/public/system localhost/jademoe bundle exec puma -C config/puma.rb 
 ExecStop=/usr/bin/podman stop mastodon-web
 ExecStopPost=/usr/bin/podman rm mastodon-web
 Type=oneshot