diff --git a/functions/src/middlewares/csrf_middleware.ts b/functions/src/middlewares/csrf_middleware.ts
index a00c3ed..a472cfa 100644
--- a/functions/src/middlewares/csrf_middleware.ts
+++ b/functions/src/middlewares/csrf_middleware.ts
@@ -26,14 +26,11 @@ export const csrfProtection: RequestHandler = (
   }
 
   const csrfCookie = req.cookies?.["CSRF-TOKEN"] as string | undefined;
-  const csrfHeader = req.header("x-csrf-token");
+  const csrfHeader = req.header("x-xsrf-token");
 
-  functions.logger.log("CSRF Cookie:", csrfCookie);
-  functions.logger.log("CSRF Header:", csrfHeader);
-
-  if (!csrfCookie || !csrfHeader || csrfCookie !== csrfHeader) {
+  if (!csrfCookie || !csrfHeader) {
     functions.logger.log(
-      "CSRF validation rejected as cookie and header does not match."
+      "CSRF validation rejected: Missing token in cookie or header"
     );
     res
       .status(403)
@@ -41,9 +38,29 @@ export const csrfProtection: RequestHandler = (
     return;
   }
 
+  if (
+    !crypto.timingSafeEqual(Buffer.from(csrfCookie), Buffer.from(csrfHeader))
+  ) {
+    functions.logger.log("CSRF validation rejected: Token mismatch");
+    res
+      .status(403)
+      .json({ status: 403, error: "CSRF token validation failed" });
+    return;
+  }
+
   next();
 };
 
 export const generateCsrfToken = (): string => {
-  return crypto.randomBytes(16).toString("hex");
+  return crypto.randomBytes(32).toString("hex");
+};
+
+export const setCsrfCookie = (res: Response, token: string): void => {
+  res.cookie("CSRF-TOKEN", token, {
+    httpOnly: true,
+    secure: true,
+    sameSite: "strict",
+    path: "/",
+    maxAge: 24 * 60 * 60 * 1000,
+  });
 };