diff --git a/compose.yml b/compose.yml
index db17372..5c1399f 100644
--- a/compose.yml
+++ b/compose.yml
@@ -23,6 +23,12 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
+
+        - "traefik.http.services.${STACK_NAME}-fedi.loadbalancer.server.port=8448"
+        - "traefik.http.routers.${STACK_NAME}-fedi.rule=Host(`${DOMAIN}`)"
+        - "traefik.http.routers.${STACK_NAME}-fedi.entrypoints=web-secure"
+        - "traefik.http.routers.${STACK_NAME}-fedi.tls.certresolver=${LETS_ENCRYPT_ENV}"
+
         - "coop-cloud.${STACK_NAME}.version=0.1.0+v1.48.0"
 
   app:
diff --git a/homeserver.yaml.tmpl b/homeserver.yaml.tmpl
index e1bc1e1..82e977f 100644
--- a/homeserver.yaml.tmpl
+++ b/homeserver.yaml.tmpl
@@ -308,6 +308,7 @@ listeners:
   - port: 8008
     tls: false
     type: http
+    bind_addresses: ["0.0.0.0"]
     x_forwarded: true
 
     {{ if eq (env "DISABLE_FEDERATION") "1" }}
diff --git a/nginx.conf.tmpl b/nginx.conf.tmpl
index c99fcc1..e3758c9 100644
--- a/nginx.conf.tmpl
+++ b/nginx.conf.tmpl
@@ -12,7 +12,13 @@ http {
   include /etc/nginx/mime.types;
 
   server {
+    {{ if eq (env "DISABLE_FEDERATION") "1" }}
+    listen 80 default_server;
+    {{ else }}
     listen 80;
+    listen 8448 default_server;
+    {{ end }}
+
     server_name {{ env "DOMAIN" }};
 
     location ~* ^(\/_matrix|\/_synapse\/client) {