diff --git a/apps/sn/middleware.ts b/apps/sn/middleware.ts
index cd5d27e05..9851437b1 100644
--- a/apps/sn/middleware.ts
+++ b/apps/sn/middleware.ts
@@ -104,31 +104,19 @@ export function middleware(req: NextRequest) {
     || pathname.startsWith("/cms-service")
     || pathname.startsWith("/user-service")
   ) {
-    const requestHeaders = new Headers(req.headers);
-    const token = req.cookies.get(CLAIM_NAME)?.value;
-    const userId = req.cookies.get(AUTH_USER_ID)?.value;
     const newUrl = `${SERVER_API_URL}${pathname}`;
-
-    if (token) requestHeaders.set(CLAIM_NAME, token);
-    if (userId) requestHeaders.set(AUTH_USER_ID, userId);
-
     console.log(`[Middleware] Rewriting from '/attach-service' path to: ${newUrl}`);
-    return NextResponse.rewrite(new URL(newUrl), {
-      headers: requestHeaders,
-    });
+    return rewriteWith(newUrl, req, true);
   }
   
   if (pathname.startsWith("/dc-service")) {
-    const requestHeaders = new Headers(req.headers);
     const decodedParams = Array.from(searchParams.entries())
     .map(([key, value]) => `${key}=${decodeURIComponent(value)}`)
     .join("&");
     
-    const newUrl = `${DC_URL}${pathname}${decodedParams ? `?${decodedParams}` : ""}`;
+    const newUrl = `${DC_URL}${pathname}${decodedParams ? `?${decodedParams}` : ""}`;    
     console.log(`[Middleware] Rewriting from '/dc-service' path to: ${newUrl}`);
-    return NextResponse.rewrite(new URL(newUrl), {
-      headers: requestHeaders,
-    });
+    return rewriteWith(newUrl, req, true);
   }
 
   if (pathname.startsWith("/sewerage-service")) {