diff --git a/apps/frontend/src/lib/components/blocks/space/space-dropdown.svelte b/apps/frontend/src/lib/components/blocks/space/space-dropdown.svelte
index 73b07033d..7e55e4822 100644
--- a/apps/frontend/src/lib/components/blocks/space/space-dropdown.svelte
+++ b/apps/frontend/src/lib/components/blocks/space/space-dropdown.svelte
@@ -17,6 +17,7 @@
   import { goto, invalidateAll } from "$app/navigation"
   import { Skeleton } from "$lib/components/ui/skeleton"
   import { toast } from "svelte-sonner"
+  import { env } from "$env/dynamic/public"
 
   export let space: ISpaceDTO
   export let me: any
diff --git a/apps/frontend/src/routes/(auth)/login/+page.svelte b/apps/frontend/src/routes/(auth)/login/+page.svelte
index 4366278cc..289867edf 100644
--- a/apps/frontend/src/routes/(auth)/login/+page.svelte
+++ b/apps/frontend/src/routes/(auth)/login/+page.svelte
@@ -19,6 +19,7 @@
   import { LoaderCircleIcon } from "lucide-svelte"
   import ResetPassword from "$lib/components/blocks/auth/reset-password.svelte"
   import { page } from "$app/stores"
+  import { env } from "$env/dynamic/public"
 
   const schema = z.object({
     email: z.string().email(),
@@ -215,14 +216,18 @@
           </div>
           <Separator class="my-6" />
           <div class="space-y-2">
-            <Button href="/login/github" variant="secondary" class="w-full">
-              <img class="mr-2 h-4 w-4" src={Github} alt="github" />
-              Login with Github
-            </Button>
-            <Button href="/login/google" variant="secondary" class="w-full">
-              <img class="mr-2 h-4 w-4" src={Google} alt="google" />
-              Login with Google
-            </Button>
+            {#if env.UNDB_PUBLIC_OAUTH_GITHUB_ENABLED === "true"}
+              <Button href="/login/github" variant="secondary" class="w-full">
+                <img class="mr-2 h-4 w-4" src={Github} alt="github" />
+                Login with Github
+              </Button>
+            {/if}
+            {#if env.UNDB_PUBLIC_OAUTH_GOOGLE_ENABLED === "true"}
+              <Button href="/login/google" variant="secondary" class="w-full">
+                <img class="mr-2 h-4 w-4" src={Google} alt="google" />
+                Login with Google
+              </Button>
+            {/if}
           </div>
         </Card.Content>
       </Card.Root>
diff --git a/apps/frontend/src/routes/(auth)/signup/+page.svelte b/apps/frontend/src/routes/(auth)/signup/+page.svelte
index 1f5407d04..a7c2ef156 100644
--- a/apps/frontend/src/routes/(auth)/signup/+page.svelte
+++ b/apps/frontend/src/routes/(auth)/signup/+page.svelte
@@ -17,6 +17,7 @@
   import { Separator } from "$lib/components/ui/separator"
   import PasswordInput from "$lib/components/ui/input/password-input.svelte"
   import { LoaderCircleIcon } from "lucide-svelte"
+  import { env } from "$env/dynamic/public"
 
   const schema = z.object({
     email: z.string().email(),
@@ -245,20 +246,25 @@
             <a href={`/login?invitationId=${invitationId}`} class="underline"> Sign in </a>
           {:else if redirect}
             <a href={`/login?redirect=${redirect}`} class="underline"> Sign in </a>
-          {:else} <a href="/login" class="underline"> Sign in </a>
+          {:else}
+            <a href="/login" class="underline"> Sign in </a>
           {/if}
         </div>
         {#if !invitationId}
           <Separator class="my-6" />
           <div class="space-y-2">
-            <Button href="/login/github" variant="secondary" class="w-full">
-              <img class="mr-2 h-4 w-4" src={Github} alt="github" />
-              Login with Github
-            </Button>
-            <Button href="/login/google" variant="secondary" class="w-full">
-              <img class="mr-2 h-4 w-4" src={Google} alt="google" />
-              Login with Google
-            </Button>
+            {#if env.UNDB_PUBLIC_OAUTH_GITHUB_ENABLED === "true"}
+              <Button href="/login/github" variant="secondary" class="w-full">
+                <img class="mr-2 h-4 w-4" src={Github} alt="github" />
+                Login with Github
+              </Button>
+            {/if}
+            {#if env.UNDB_PUBLIC_OAUTH_GOOGLE_ENABLED === "true"}
+              <Button href="/login/google" variant="secondary" class="w-full">
+                <img class="mr-2 h-4 w-4" src={Google} alt="google" />
+                Login with Google
+              </Button>
+            {/if}
           </div>
         {/if}
       </Card.Content>
diff --git a/apps/frontend/svelte.config.js b/apps/frontend/svelte.config.js
index b4ae95626..d236ed9ea 100644
--- a/apps/frontend/svelte.config.js
+++ b/apps/frontend/svelte.config.js
@@ -12,6 +12,9 @@ const config = {
       pages: "dist",
       fallback: "index.html",
     }),
+    env: {
+      publicPrefix: "UNDB_PUBLIC_",
+    },
     alias: {
       $houdini: "./$houdini",
     },