diff --git a/deploy/dev/cm.yaml b/deploy/dev/cm.yaml
index 706e69eb..1e791052 100644
--- a/deploy/dev/cm.yaml
+++ b/deploy/dev/cm.yaml
@@ -20,7 +20,6 @@ data:
     	}
 
     	reverse_proxy xlog-internal.crossbell.svc:3000 {
-        header_up host {host}
         header_up x-forwarded-proto http
       }
     }
@@ -35,7 +34,6 @@ data:
     	}
 
     	reverse_proxy xlog-internal.crossbell.svc:3000 {
-        header_up host {host}
         header_up x-forwarded-proto http
       }
     }
diff --git a/src/middleware.ts b/src/middleware.ts
index 01bcf659..0af5c1c6 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -45,7 +45,10 @@ export default async function middleware(req: NextRequest) {
     pathname === "/atom.xml" ||
     pathname === "/feed/xml"
   ) {
-    return NextResponse.redirect(`https://${req.headers.get("host")}/feed`, 301)
+    return NextResponse.redirect(
+      `https://${req.headers.get("x-forwarded-host")}/feed`,
+      301,
+    )
   }
 
   console.debug(`${req.method} ${req.nextUrl}`)
@@ -72,7 +75,10 @@ export default async function middleware(req: NextRequest) {
   try {
     tenant = await (
       await fetch(
-        new URL(`/api/host2handle?host=${req.headers.get("host")}`, req.url),
+        new URL(
+          `/api/host2handle?host=${req.headers.get("x-forwarded-host")}`,
+          req.url,
+        ),
       )
     ).json()
   } catch (error) {