diff --git a/beeper/etc/containers/systemd/ask-js/ask-js.container b/beeper/etc/containers/systemd/ask-js/ask-js.container
index cc0fe55..7749725 100644
--- a/beeper/etc/containers/systemd/ask-js/ask-js.container
+++ b/beeper/etc/containers/systemd/ask-js/ask-js.container
@@ -6,6 +6,7 @@ Requires=postgresql.service
 [Container]
 Image=ghcr.io/ihateblueb/ask-js:dev
 ContainerName=ask-js
+Network=ask-js.network
 Network=postgresql.network
 PublishPort=127.0.0.1:20617:3579
 Volume=/var/containers/ask-js/config.json:/app/config/config.json:ro,Z
diff --git a/beeper/etc/containers/systemd/ask-js/ask-js.network b/beeper/etc/containers/systemd/ask-js/ask-js.network
new file mode 100644
index 0000000..70cde7b
--- /dev/null
+++ b/beeper/etc/containers/systemd/ask-js/ask-js.network
@@ -0,0 +1,2 @@
+[Network]
+IPv6=true
diff --git a/beeper/etc/containers/systemd/forgejo/forgejo-runner.container b/beeper/etc/containers/systemd/forgejo/forgejo-runner.container
index f311c8a..8136a71 100644
--- a/beeper/etc/containers/systemd/forgejo/forgejo-runner.container
+++ b/beeper/etc/containers/systemd/forgejo/forgejo-runner.container
@@ -7,10 +7,11 @@ Requires=dind.service
 Image=data.forgejo.org/forgejo/runner:4.0.0
 ContainerName=forgejo-runner
 EnvironmentFile=/var/containers/forgejo/.env.runner
+Network=forgejo.network
 User=1001:1001
+Exec=/bin/sh -c "sleep 5; forgejo-runner daemon"
 Volume=/var/containers/forgejo/runner:/data:Z
 Volume=/var/run/dind/docker.sock:/var/run/docker.sock:z
-Exec=/bin/sh -c "sleep 5; forgejo-runner daemon"
 
 [Service]
 Restart=always
diff --git a/beeper/etc/containers/systemd/forgejo/forgejo.container b/beeper/etc/containers/systemd/forgejo/forgejo.container
index 21879ac..746e89e 100644
--- a/beeper/etc/containers/systemd/forgejo/forgejo.container
+++ b/beeper/etc/containers/systemd/forgejo/forgejo.container
@@ -7,6 +7,7 @@ Requires=postgresql.service
 Image=codeberg.org/forgejo/forgejo:13
 ContainerName=forgejo
 EnvironmentFile=/var/containers/forgejo/.env
+Network=forgejo.network
 Network=postgresql.network
 PublishPort=127.0.0.1:41807:3000
 PublishPort=10429:22
diff --git a/beeper/etc/containers/systemd/forgejo/forgejo.network b/beeper/etc/containers/systemd/forgejo/forgejo.network
new file mode 100644
index 0000000..70cde7b
--- /dev/null
+++ b/beeper/etc/containers/systemd/forgejo/forgejo.network
@@ -0,0 +1,2 @@
+[Network]
+IPv6=true
diff --git a/beeper/etc/containers/systemd/iceshrimp/iceshrimp.container b/beeper/etc/containers/systemd/iceshrimp/iceshrimp.container
index 13199d1..c501457 100644
--- a/beeper/etc/containers/systemd/iceshrimp/iceshrimp.container
+++ b/beeper/etc/containers/systemd/iceshrimp/iceshrimp.container
@@ -7,6 +7,7 @@ After=postgresql.service
 Image=iceshrimp.dev/iceshrimp/iceshrimp.net:dev
 ContainerName=iceshrimp
 Environment=ICESHRIMP_CONFIG_OVERRIDES=/app/config/configuration.ini
+Network=iceshrimp.network
 Network=postgresql.network
 PublishPort=127.0.0.1:24042:24042
 Volume=/var/containers/iceshrimp/data/media:/data/media:Z
diff --git a/beeper/etc/containers/systemd/iceshrimp/iceshrimp.network b/beeper/etc/containers/systemd/iceshrimp/iceshrimp.network
new file mode 100644
index 0000000..70cde7b
--- /dev/null
+++ b/beeper/etc/containers/systemd/iceshrimp/iceshrimp.network
@@ -0,0 +1,2 @@
+[Network]
+IPv6=true
diff --git a/beeper/etc/containers/systemd/mastodon/mastodon.network b/beeper/etc/containers/systemd/mastodon/mastodon.network
index b245ebd..70cde7b 100644
--- a/beeper/etc/containers/systemd/mastodon/mastodon.network
+++ b/beeper/etc/containers/systemd/mastodon/mastodon.network
@@ -1,3 +1,2 @@
 [Network]
-NetworkName=mastodon
 IPv6=true
diff --git a/beeper/etc/containers/systemd/postgresql/postgresql.network b/beeper/etc/containers/systemd/postgresql/postgresql.network
index e4d4ea8..62fd4f6 100644
--- a/beeper/etc/containers/systemd/postgresql/postgresql.network
+++ b/beeper/etc/containers/systemd/postgresql/postgresql.network
@@ -1,2 +1,4 @@
 [Network]
-NetworkName=postgresql
\ No newline at end of file
+NetworkName=postgresql
+IPv6=true
+Internal=true
diff --git a/beeper/etc/containers/systemd/searxng/searxng.network b/beeper/etc/containers/systemd/searxng/searxng.network
index ef28705..70cde7b 100644
--- a/beeper/etc/containers/systemd/searxng/searxng.network
+++ b/beeper/etc/containers/systemd/searxng/searxng.network
@@ -1,3 +1,2 @@
 [Network]
-NetworkName=searxng
 IPv6=true
diff --git a/beeper/etc/containers/systemd/sharkey/sharkey-activity.container b/beeper/etc/containers/systemd/sharkey/sharkey-activity.container
index 5905e09..6f577a8 100644
--- a/beeper/etc/containers/systemd/sharkey/sharkey-activity.container
+++ b/beeper/etc/containers/systemd/sharkey/sharkey-activity.container
@@ -12,8 +12,8 @@ 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
+Network=postgresql.network
 PublishPort=127.0.0.1:47815:3002
 Volume=/var/containers/sharkey/files:/sharkey/files:z
 Volume=/var/containers/sharkey/activity:/sharkey/.config:z
diff --git a/beeper/etc/containers/systemd/sharkey/sharkey-api.container b/beeper/etc/containers/systemd/sharkey/sharkey-api.container
index 5ee4df0..7d7ccea 100644
--- a/beeper/etc/containers/systemd/sharkey/sharkey-api.container
+++ b/beeper/etc/containers/systemd/sharkey/sharkey-api.container
@@ -11,8 +11,8 @@ 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
+Network=postgresql.network
 PublishPort=127.0.0.1:60628:3001
 Volume=/var/containers/sharkey/files:/sharkey/files:z
 Volume=/var/containers/sharkey/api:/sharkey/.config:z
diff --git a/beeper/etc/containers/systemd/sharkey/sharkey-media.container b/beeper/etc/containers/systemd/sharkey/sharkey-media.container
index 72a4b8a..deb49f5 100644
--- a/beeper/etc/containers/systemd/sharkey/sharkey-media.container
+++ b/beeper/etc/containers/systemd/sharkey/sharkey-media.container
@@ -12,8 +12,8 @@ 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
+Network=postgresql.network
 PublishPort=127.0.0.1:57378:3003
 Volume=/var/containers/sharkey/files:/sharkey/files:z
 Volume=/var/containers/sharkey/media:/sharkey/.config:z
diff --git a/beeper/etc/containers/systemd/sharkey/sharkey-worker.container b/beeper/etc/containers/systemd/sharkey/sharkey-worker.container
index ffa6d37..74427f0 100644
--- a/beeper/etc/containers/systemd/sharkey/sharkey-worker.container
+++ b/beeper/etc/containers/systemd/sharkey/sharkey-worker.container
@@ -10,8 +10,8 @@ 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
+Network=postgresql.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
diff --git a/beeper/etc/containers/systemd/sharkey/sharkey.network b/beeper/etc/containers/systemd/sharkey/sharkey.network
index e8b6107..70cde7b 100644
--- a/beeper/etc/containers/systemd/sharkey/sharkey.network
+++ b/beeper/etc/containers/systemd/sharkey/sharkey.network
@@ -1,3 +1,2 @@
 [Network]
-NetworkName=sharkey
 IPv6=true