diff --git a/src/functions/auth/login-user.ts b/src/functions/auth/login-user.ts
index 2560bf6..3b37a22 100644
--- a/src/functions/auth/login-user.ts
+++ b/src/functions/auth/login-user.ts
@@ -116,15 +116,17 @@ export default async function loginUser({
 
     const { auth_key_cookie_name, csrf_cookie_name } = grabCookieNames();
 
+    const host = req.headers.host;
+
     setCookie(res, [
         {
             name: auth_key_cookie_name,
             value: encrypted_payload || "",
             options: {
-                secure: req.headers.origin !== "localhost",
+                secure: host !== "localhost",
                 path: "/",
                 expires: expiration_date,
-                domain: req.headers.origin,
+                domain: host,
             },
         },
         {
@@ -133,7 +135,7 @@ export default async function loginUser({
             options: {
                 path: "/",
                 expires: expiration_date,
-                domain: req.headers.origin,
+                domain: host,
             },
         },
     ]);
diff --git a/src/functions/auth/logout-user.ts b/src/functions/auth/logout-user.ts
index d21d7a5..ed9ed91 100644
--- a/src/functions/auth/logout-user.ts
+++ b/src/functions/auth/logout-user.ts
@@ -15,19 +15,21 @@ export default async function logoutUser({
 }: Params): Promise<APIResponseObject> {
     const { auth_key_cookie_name, csrf_cookie_name } = grabCookieNames();
 
+    const host = req.headers.host;
+
     deleteCookie(res, [
         {
             name: auth_key_cookie_name,
             options: {
                 path: "/",
-                domain: req.headers.origin,
+                domain: host,
             },
         },
         {
             name: csrf_cookie_name,
             options: {
                 path: "/",
-                domain: req.headers.origin,
+                domain: host,
             },
         },
     ]);
diff --git a/test.env b/test.env
index c6b5832..47be0be 100644
--- a/test.env
+++ b/test.env
@@ -1,8 +1,2 @@
 DSQL_ENCRYPTION_PASSWORD=
-DSQL_ENCRYPTION_SALT=
-
-WEB_SOCKET_PORT=3773
-PORT=3772
-HOST=http://localhost:46079
-
-DOMAIN=localhost
\ No newline at end of file
+DSQL_ENCRYPTION_SALT=
\ No newline at end of file