diff --git a/deploy/dev/cm.yaml b/deploy/dev/cm.yaml
index f4301919..cb9f6a15 100644
--- a/deploy/dev/cm.yaml
+++ b/deploy/dev/cm.yaml
@@ -19,7 +19,7 @@ data:
     		dns cloudflare {env.CF_API_TOKEN}
     	}
 
-    	reverse_proxy xlog-internal.crossbell.svc:3000 {
+    	reverse_proxy http://xlog-internal.crossbell.svc:3000 {
         header_up X-Forwarded-Host {host}
       }
     }
@@ -33,7 +33,7 @@ data:
     		on_demand
     	}
 
-    	reverse_proxy xlog-internal.crossbell.svc:3000 {
+    	reverse_proxy http://xlog-internal.crossbell.svc:3000 {
         header_up X-Forwarded-Host {host}
       }
     }
diff --git a/deploy/prod/cm.yaml b/deploy/prod/cm.yaml
index 9d4f2a77..697e969b 100644
--- a/deploy/prod/cm.yaml
+++ b/deploy/prod/cm.yaml
@@ -19,7 +19,7 @@ data:
     		dns cloudflare {env.CF_API_TOKEN}
     	}
 
-    	reverse_proxy xlog-internal.crossbell.svc:3000 {
+    	reverse_proxy http://xlog-internal.crossbell.svc:3000 {
         header_up X-Forwarded-Host {host}
       }
     }
@@ -33,7 +33,7 @@ data:
     		on_demand
     	}
 
-    	reverse_proxy xlog-internal.crossbell.svc:3000 {
+    	reverse_proxy http://xlog-internal.crossbell.svc:3000 {
         header_up X-Forwarded-Host {host}
       }
     }
diff --git a/src/middleware.ts b/src/middleware.ts
index c2324874..f9c43884 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -92,7 +92,10 @@ export default async function middleware(req: NextRequest) {
 
   if (tenant?.subdomain) {
     return NextResponse.rewrite(
-      new URL(`/site/${tenant?.subdomain}${pathname}`, req.url),
+      new URL(
+        `/site/${tenant?.subdomain}${pathname}${req.nextUrl.search}`,
+        req.url,
+      ),
       {
         request: {
           headers: requestHeaders,