diff --git a/be/app/main.py b/be/app/main.py
index eca992d..3fde609 100644
--- a/be/app/main.py
+++ b/be/app/main.py
@@ -182,10 +182,13 @@ app.include_router(
 )
 
 # Include OAuth routes
-app.include_router(oauth_router, prefix="/auth", tags=["auth"])
+# app.include_router(oauth_router, prefix="/auth", tags=["auth"])
 
 # Include your API router
 app.include_router(api_router, prefix=settings.API_PREFIX)
+
+# Include OAuth routes under the main API prefix
+app.include_router(oauth_router, prefix=f"{settings.API_PREFIX}/auth", tags=["auth"])
 # --- End Include API Routers ---
 
 # Health check endpoint
diff --git a/fe/src/components/SocialLoginButtons.vue b/fe/src/components/SocialLoginButtons.vue
index 524dc76..3daf209 100644
--- a/fe/src/components/SocialLoginButtons.vue
+++ b/fe/src/components/SocialLoginButtons.vue
@@ -39,7 +39,7 @@ import { useRouter } from 'vue-router';
 const router = useRouter();
 
 const handleGoogleLogin = () => {
-    window.location.href = '/auth/google/login';
+    window.location.href = '/api/v1/auth/google/login';
 };
 
 const handleAppleLogin = () => {