diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index d158456a..6f79ea97 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,5 +1,14 @@
 name: CI
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+
 jobs:
   frontend:
     name: frontend (eslint)
@@ -16,6 +25,8 @@ jobs:
         run: npm install
       - name: ESLint
         run: npm run lint
+      - name: Build
+        run: npm run build
   backend:
     name: backend (format, lint)
     runs-on: ubuntu-latest
diff --git a/backend/src/app.py b/backend/src/app.py
index 9cba711f..d2f3abd2 100644
--- a/backend/src/app.py
+++ b/backend/src/app.py
@@ -6,6 +6,7 @@
 import logging
 
 from src.common.base import Base
+from src.common.constants import FRONTEND_URL
 from src.common.database import engine
 
 logging.getLogger("passlib").setLevel(logging.ERROR)
@@ -19,8 +20,7 @@ async def lifespan(app: FastAPI):
 
 server = FastAPI(lifespan=lifespan)
 
-# TODO: refactor to env variable
-origins = ["http://localhost:3000"]
+origins = [FRONTEND_URL]
 
 server.add_middleware(
     CORSMiddleware,
diff --git a/frontend/app/auth/google/layout.tsx b/frontend/app/auth/google/layout.tsx
new file mode 100644
index 00000000..4c7ccaef
--- /dev/null
+++ b/frontend/app/auth/google/layout.tsx
@@ -0,0 +1,7 @@
+import { Suspense } from "react";
+
+export default function Layout({
+  children,
+}: Readonly<{ children: React.ReactNode }>) {
+  return <Suspense>{children}</Suspense>;
+}
diff --git a/frontend/app/login/page.tsx b/frontend/app/login/page.tsx
index 7bc32e4c..d5f183c1 100644
--- a/frontend/app/login/page.tsx
+++ b/frontend/app/login/page.tsx
@@ -45,6 +45,7 @@ function LoginPage() {
   const onSubmit: SubmitHandler<LoginForm> = async (data) => {
     const response = await logInAuthLoginPost({
       body: { username: data.email, password: data.password },
+      withCredentials: true,
     });
 
     if (response.error) {