diff --git a/servers/containers/conduwuit-testing.container b/servers/containers/conduwuit-testing.container
index 1ff3de580..81a334aa1 100644
--- a/servers/containers/conduwuit-testing.container
+++ b/servers/containers/conduwuit-testing.container
@@ -14,15 +14,19 @@ Image=ghcr.io/girlbossceo/conduwuit:main
 ReadOnly=true
 Volume=/var/opt/conduwuit-testing:/var/lib/conduwuit:z,U
 AutoUpdate=registry
-Network=web.network:ip=10.89.0.245,ip6=fd76:6f6d:f45e:ea1a::f9
 
-Network=pub.network
 # conduwuit uses quite a few file descriptors, and on some systems it defaults to 1024
 Ulimit=nofile=1048567:1048567
 
 Label="traefik.enable=true"
 Label="traefik.http.routers.conduwuit-testing.rule=(Host(`matrix.pissing.dev`) || (Host(`pissing.dev`) && PathPrefix(`/.well-known/matrix`)))"
+
 Label="traefik.http.services.conduwuit-testing.loadbalancer.server.port=6168"
+Environment="CONDUWUIT_PORT=6168"
+
+Network=web.network:ip=10.89.0.245,ip6=fd76:6f6d:f45e:ea1a::f9
+Label="traefik.docker.network=systemd-web"
+Environment="CONDUWUIT_ADDRESS=[\"10.89.0.245\", \"fd76:6f6d:f45e:ea1a::f9\"]"
 
 Label="traefik.http.routers.conduwuit-testing.entrypoints=https,matrix"
 
@@ -41,10 +45,6 @@ Environment="CONDUWUIT_SERVER_NAME=pissing.dev"
 
 Environment="CONDUWUIT_DATABASE_PATH=/var/lib/conduwuit"
 Environment="CONDUWUIT_DATABASE_BACKEND=rocksdb"
-# should match the loadbalancer traefik label
-Environment="CONDUWUIT_PORT=6168"
-Environment="CONDUWUIT_ADDRESS=[\"10.89.0.245\", \"fd76:6f6d:f45e:ea1a::f9\"]"
-Label="traefik.docker.network=systemd-web"
 # in bytes, ~20 MB
 Environment="CONDUWUIT_MAX_REQUEST_SIZE=20000000"
 
@@ -67,8 +67,9 @@ server=matrix.pissing.dev:443 \
 Environment="CONDUWUIT_TURN_URIS=[\"turns:coturn.ellis.link?transport=udp\",\"turns:coturn.ellis.link?transport=tcp\",\"turn:coturn.ellis.link?transport=udp\",\"turn:coturn.ellis.link?transport=tcp\"]"
 Environment="CONDUWUIT_TURN_SECRET=qjRh55G51K7V0ZqB7Z8ZEkxZjBLJMgkwEs8acFjx"
 
+Network=pub.network
 Environment="CONDUWUIT_URL_PREVIEW_DOMAIN_EXPLICIT_ALLOWLIST=[\"*\"]"
-Environment="CONDUWUIT_URL_PREVIEW_BOUND_INTERFACE=eth1"
+Environment="CONDUWUIT_URL_PREVIEW_BOUND_INTERFACE=eth0"
 
 # Environment="CONDUWUIT_SENTRY=true"
 # Environment="CONDUWUIT_SENTRY_ENDPOINT=https://c885d1475cef5c54bbd32b1512e0ae20@o4507835405369344.ingest.de.sentry.io/4508059491696720"
diff --git a/servers/containers/conduwuit.container b/servers/containers/conduwuit.container
index c20ac0216..4ea898992 100644
--- a/servers/containers/conduwuit.container
+++ b/servers/containers/conduwuit.container
@@ -14,13 +14,19 @@ Image=ghcr.io/girlbossceo/conduwuit:main
 ReadOnly=true
 Volume=/var/opt/conduwuit:/var/lib/conduwuit:z,U
 AutoUpdate=registry
-Network=web.network
 # conduwuit uses quite a few file descriptors, and on some systems it defaults to 1024
 Ulimit=nofile=1048567:1048567
 
 Label="traefik.enable=true"
 Label="traefik.http.routers.conduwuit.rule=(Host(`matrix.ellis.link`) || (Host(`ellis.link`) && PathPrefix(`/.well-known/matrix`)))"
+
 Label="traefik.http.services.conduwuit.loadbalancer.server.port=6167"
+Environment="CONDUWUIT_PORT=6167"
+
+# 
+Network=web.network:ip=10.89.0.248,ip6=fd76:6f6d:f45e:ea1a::fb
+Environment="CONDUWUIT_ADDRESS=[\"10.89.0.248\", \"fd76:6f6d:f45e:ea1a::fb\"]"
+Label="traefik.docker.network=systemd-web"
 
 Label="traefik.http.routers.conduwuit.entrypoints=https,matrix"
 
@@ -39,10 +45,6 @@ Environment="CONDUWUIT_SERVER_NAME=ellis.link"
 
 Environment="CONDUWUIT_DATABASE_PATH=/var/lib/conduwuit"
 Environment="CONDUWUIT_DATABASE_BACKEND=rocksdb"
-# should match the loadbalancer traefik label
-Environment="CONDUWUIT_PORT=6167"
-Environment="CONDUWUIT_ADDRESS=0.0.0.0"
-Label="traefik.docker.network=systemd-web"
 # in bytes, ~20 MB
 Environment="CONDUWUIT_MAX_REQUEST_SIZE=20000000"
 
@@ -52,7 +54,7 @@ Environment="CONDUWUIT_ALLOW_FEDERATION=true"
 Environment="CONDUWUIT_ALLOW_PUBLIC_ROOM_DIRECTORY_OVER_FEDERATION=true"
 # Work around conduwuit sync polling bug
 Environment="CONDUWUIT_ALLOW_INCOMING_PRESENCE=false"
- 
+
 
 Environment="CONDUWUIT_TRUSTED_SERVERS=[\"matrix.org\", \"matrix.pissing.dev\", \"matrix.ellis.link\"]"
 Environment="CONDUWUIT_LOG=info,hickory_proto::xfer::dns_exchange=error"
@@ -65,8 +67,8 @@ Environment="CONDUWUIT_TURN_URIS=[\"turns:coturn.ellis.link?transport=udp\",\"tu
 Environment="CONDUWUIT_TURN_SECRET=qjRh55G51K7V0ZqB7Z8ZEkxZjBLJMgkwEs8acFjx"
 
 Network=pub.network
-Environment="CONDUWUIT_URL_PREVIEW_DOMAIN_EXPLICIT_ALLOWLIST=["*"]"
-Environment="CONDUWUIT_URL_PREVIEW_BOUND_INTERFACE=eth1@eth1"
+Environment="CONDUWUIT_URL_PREVIEW_DOMAIN_EXPLICIT_ALLOWLIST=[\"*\"]"
+Environment="CONDUWUIT_URL_PREVIEW_BOUND_INTERFACE=eth0"
 
 Environment="CONDUWUIT_SENTRY=true"
 Environment="CONDUWUIT_SENTRY_ENDPOINT=https://c885d1475cef5c54bbd32b1512e0ae20@o4507835405369344.ingest.de.sentry.io/4508059491696720"
diff --git a/servers/containers/pub.network b/servers/containers/pub.network
index afb33005e..8483b26f0 100644
--- a/servers/containers/pub.network
+++ b/servers/containers/pub.network
@@ -3,5 +3,7 @@ DisableDNS=false
 IPv6=true
 Subnet=10.89.1.0/24
 Gateway=10.89.1.1
-Driver=macvlan
+Driver=ipvlan
 Options=parent=eno1
+Options=mode=l3
+