diff --git a/shop/app/api/admin/send-test-email/route.ts b/shop/app/api/admin/send-test-email/route.ts
index db86c76..5e19db1 100644
--- a/shop/app/api/admin/send-test-email/route.ts
+++ b/shop/app/api/admin/send-test-email/route.ts
@@ -6,8 +6,9 @@ import { cookies } from 'next/headers';
 export async function POST(request: Request) {
   const cookieStore = await cookies();
 
+  const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL || process.env.SUPABASE_URL || '';
   const supabase = createServerClient(
-    process.env.NEXT_PUBLIC_SUPABASE_URL ?? '',
+    supabaseUrl,
     process.env.SUPABASE_SERVICE_ROLE_KEY ?? '',
     {
       cookies: {
diff --git a/shop/app/api/admin/smtp-settings/route.ts b/shop/app/api/admin/smtp-settings/route.ts
index 06ac7eb..6e331ad 100644
--- a/shop/app/api/admin/smtp-settings/route.ts
+++ b/shop/app/api/admin/smtp-settings/route.ts
@@ -5,8 +5,9 @@ import { cookies } from 'next/headers';
 export async function GET() {
     const cookieStore = await cookies();
 
+  const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL || process.env.SUPABASE_URL || '';
   const supabase = createServerClient(
-    process.env.NEXT_PUBLIC_SUPABASE_URL ?? '',
+    supabaseUrl,
     process.env.SUPABASE_SERVICE_ROLE_KEY ?? '',
     {
       cookies: {
@@ -45,8 +46,9 @@ export async function GET() {
 export async function POST(request: Request) {
     const cookieStore = await cookies();
 
+    const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL || process.env.SUPABASE_URL || '';
     const supabase = createServerClient(
-      process.env.NEXT_PUBLIC_SUPABASE_URL ?? '',
+      supabaseUrl,
       process.env.SUPABASE_SERVICE_ROLE_KEY ?? '',
       {
         cookies: {
diff --git a/shop/lib/supabase/admin.ts b/shop/lib/supabase/admin.ts
index 85013d3..0d212d9 100644
--- a/shop/lib/supabase/admin.ts
+++ b/shop/lib/supabase/admin.ts
@@ -2,9 +2,10 @@ import { createClient } from '@supabase/supabase-js'
 
 export function createAdminClient() {
   const serviceRoleKey = process.env.SUPABASE_SERVICE_ROLE_KEY || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RAZx35lJzdJsyH-qQwv8Hdp7fsn3W0YpN81IU'
+  const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL || process.env.SUPABASE_URL;
   
   return createClient(
-    process.env.NEXT_PUBLIC_SUPABASE_URL!,
+    supabaseUrl!,
     serviceRoleKey,
     {
       auth: {
diff --git a/shop/lib/supabase/client.ts b/shop/lib/supabase/client.ts
index e50bdf6..112957f 100644
--- a/shop/lib/supabase/client.ts
+++ b/shop/lib/supabase/client.ts
@@ -1,8 +1,11 @@
 import { createBrowserClient } from "@supabase/ssr";
 
 export function createClient() {
+  const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL || process.env.SUPABASE_URL;
+  const supabaseAnonKey = process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY || process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY || process.env.SUPABASE_ANON_KEY;
+
   return createBrowserClient(
-    process.env.NEXT_PUBLIC_SUPABASE_URL!,
-    process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY!,
+    supabaseUrl!,
+    supabaseAnonKey!,
   );
 }
diff --git a/shop/lib/supabase/proxy.ts b/shop/lib/supabase/proxy.ts
index c705a81..6d25130 100644
--- a/shop/lib/supabase/proxy.ts
+++ b/shop/lib/supabase/proxy.ts
@@ -13,11 +13,12 @@ export async function updateSession(request: NextRequest) {
     return supabaseResponse;
   }
 
-  // With Fluid compute, don't put this client in a global environment
-  // variable. Always create a new one on each request.
+  const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL || process.env.SUPABASE_URL;
+  const supabaseAnonKey = process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY || process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY || process.env.SUPABASE_ANON_KEY;
+
   const supabase = createServerClient(
-    process.env.NEXT_PUBLIC_SUPABASE_URL!,
-    process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY!,
+    supabaseUrl!,
+    supabaseAnonKey!,
     {
       cookies: {
         getAll() {
diff --git a/shop/lib/supabase/server.ts b/shop/lib/supabase/server.ts
index fb35301..c5955f6 100644
--- a/shop/lib/supabase/server.ts
+++ b/shop/lib/supabase/server.ts
@@ -9,9 +9,12 @@ import { cookies } from "next/headers";
 export async function createClient() {
   const cookieStore = await cookies();
 
+  const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL || process.env.SUPABASE_URL;
+  const supabaseAnonKey = process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY || process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY || process.env.SUPABASE_ANON_KEY;
+
   return createServerClient(
-    process.env.NEXT_PUBLIC_SUPABASE_URL!,
-    process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY!,
+    supabaseUrl!,
+    supabaseAnonKey!,
     {
       cookies: {
         getAll() {
diff --git a/shop/lib/utils.ts b/shop/lib/utils.ts
index 8173d37..63e3596 100644
--- a/shop/lib/utils.ts
+++ b/shop/lib/utils.ts
@@ -7,5 +7,7 @@ export function cn(...inputs: ClassValue[]) {
 
 // This check can be removed, it is just for tutorial purposes
 export const hasEnvVars =
-  process.env.NEXT_PUBLIC_SUPABASE_URL &&
-  process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY;
+  (process.env.NEXT_PUBLIC_SUPABASE_URL || process.env.SUPABASE_URL) &&
+  (process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY ||
+    process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY ||
+    process.env.SUPABASE_ANON_KEY);