diff --git a/collabora/collabora.container b/collabora/collabora.container
index ac088fd..93932b1 100644
--- a/collabora/collabora.container
+++ b/collabora/collabora.container
@@ -1,17 +1,15 @@
 [Unit]
 Description=Collabora Container
-Requires=nginx-proxy.service
-After=nginx-proxy.service
 
 [Container]
-Pod=nginx-proxy.pod
+Network=host
 ContainerName=collabora
 Image=docker.io/collabora/code:latest
 
 # Enable auto-update container
 AutoUpdate=registry
 # pass this to attach it to container
-Environment=extra_params="--o:ssl.enable=false --o:ssl.termination=true --o:net.post_allow.host[0]=160.202.39.[0-9]{1,3} --o:net.post_allow_host[1]=100.64.0.[0-9]{1,3} --o:per_document.max_concurrency=12 --o:num_prespawn_children=12 --o:net.frame_ancestors=${CLOUD}"
+Environment=extra_params="--o:remote_font_config.url=${CLOUD}/apps/richdocuments/settings/fonts.json --o:ssl.enable=false --o:ssl.termination=true --o:net.post_allow.host[0]=160.202.39.[0-9]{1,3} --o:net.post_allow_host[1]=100.64.0.[0-9]{1,3} --o:per_document.max_concurrency=12 --o:num_prespawn_children=12"
 Environment=aliasgroup1=${CLOUD}:443
 Environment=domain1=${CLOUD}:443
 Environment=DONT_GEN_SSL_CERT=true
diff --git a/gitea/gitea.container b/gitea/gitea.container
index b2506db..decc8d8 100644
--- a/gitea/gitea.container
+++ b/gitea/gitea.container
@@ -12,7 +12,6 @@ Environment=DISABLE_REGISTRATION=true
 Environment=USER_UID=1000
 Environment=USER_GID=1000
 
-PublishPort=3001:3000
 PublishPort=2222:22
 
 UIDMap=1000:0:1
@@ -22,6 +21,7 @@ UIDMap=0:1:1000
 AddCapability=CAP_NET_BIND_SERVICE
 
 Volume=%h/podman/gitea:/data
+Volume=%h/podman/gitea/.socket:/tmp/gitea/
 Volume=/etc/timezone:/etc/timezone:ro
 Volume=/etc/localtime:/etc/localtime:ro
 
diff --git a/headscale/headscale.container b/headscale/headscale.container
index afe4188..50460d4 100644
--- a/headscale/headscale.container
+++ b/headscale/headscale.container
@@ -1,10 +1,8 @@
 [Unit]
 Description=Headscale Container
-Requires=nginx-proxy.service
-After=nginx-proxy.service
 
 [Container]
-Pod=nginx-proxy.pod
+Network=host
 ContainerName=headscale
 Image=docker.io/headscale/headscale:latest
 Exec=serve
diff --git a/matrix/matrix.pod b/matrix/matrix.pod
new file mode 100644
index 0000000..383c5f5
--- /dev/null
+++ b/matrix/matrix.pod
@@ -0,0 +1,7 @@
+[Unit]
+Description=Matrix Pod
+
+[Pod]
+PodName=matrix
+Volume=%h/podman/matrix/.socket:/tmp/matrix
+#Network=host
diff --git a/matrix/synapse.container b/matrix/synapse.container
index d1a13ae..82fd1fe 100644
--- a/matrix/synapse.container
+++ b/matrix/synapse.container
@@ -1,10 +1,10 @@
 [Unit]
 Description=Synapse Container
-Requires=nginx-proxy.service synapse_db.service
-After=nginx-proxy.service synapse_db.service
+Requires=synapse_db.service
+After=synapse_db.service
 
 [Container]
-Pod=nginx-proxy.pod
+Pod=matrix.pod
 ContainerName=synapse
 Image=docker.io/matrixdotorg/synapse:latest
 
@@ -23,7 +23,6 @@ Environment=GID=0
 Environment=TZ=${TZ}
 
 Volume=%h/podman/matrix/synapse:/data
-Volume=%h/podman/matrix/.socket:/tmp/matrix
 
 [Service]
 # pass this to autofill above variables
diff --git a/matrix/synapse_db.container b/matrix/synapse_db.container
index 22bee1b..5f16652 100644
--- a/matrix/synapse_db.container
+++ b/matrix/synapse_db.container
@@ -2,7 +2,7 @@
 Description=Synapse Database Container
 
 [Container]
-Pod=nginx-proxy.pod
+Pod=matrix.pod
 ContainerName=synapse_db
 Image=docker.io/library/postgres:alpine
 Exec=postgres -c unix_socket_directories='/var/run/postgresql/,/tmp/matrix/' -c unix_socket_permissions=0770 -c shared_buffers=2GB -c work_mem=64MB -c effective_cache_size=4GB
@@ -15,7 +15,6 @@ Environment=POSTGRES_USER=${POSTGRES_USER}
 Environment=POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=C --lc-ctype=C
 
 Volume=%h/podman/matrix/database:/var/lib/postgresql/data
-Volume=%h/podman/matrix/.socket:/tmp/matrix
 
 [Service]
 # pass this to autofill above variables
diff --git a/ntfy/ntfy.container b/ntfy/ntfy.container
index f810fa9..23a32aa 100644
--- a/ntfy/ntfy.container
+++ b/ntfy/ntfy.container
@@ -1,10 +1,8 @@
 [Unit]
 Description=Ntfy Container
-Requires=nginx-proxy.service
-After=nginx-proxy.service
 
 [Container]
-Pod=nginx-proxy.pod
+Network=host
 ContainerName=ntfy
 Image=docker.io/binwiederhier/ntfy:latest
 Exec=serve