diff --git a/.env.example b/.env.example
index 80f9cce8..fbbd4b7e 100644
--- a/.env.example
+++ b/.env.example
@@ -1,8 +1,7 @@
 OPENAI_API_KEY='<Optional. Open AI API key for AI help in Supabase studio>'
 VITE_SUPABASE_URL='https://127.0.0.1:54321'
-VITE_SUPABASE_ANON_KEY='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0'
-SUPABASE_SERVICE_ROLE_KEY='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RAZx35lJzdJsyH-qQwv8Hdp7fsn3W0YpN81IU'
-SUPABASE_JWT_SECRET='super-secret-jwt-token-with-at-least-32-characters-long'
+VITE_SUPABASE_PUBLISHABLE_KEY='sb_publishable_ACJWlzQHlZjBrEguHvfOxg_3BJgxAaH'
+SUPABASE_SECRET_KEY='sb_secret_N7UND0UgjKTVK-Uodkm0Hg_xSvEMPvz'
 VITE_OPEN_SECRET_CLIENT_ID='a5e351d4-6dd9-4ee6-8e36-f5fb871e5432'
 VITE_OPEN_SECRET_API_URL='https://enclave.trymaple.ai'
 SENTRY_AUTH_TOKEN='<Optional. Sentry auth token for source maps upload. Set to .env file if you need to upload source maps from local env. For Vercel builds it is set in Vercel dashboard.>'
diff --git a/.env.test b/.env.test
index c7674ec0..6f4d1864 100644
--- a/.env.test
+++ b/.env.test
@@ -1,7 +1,6 @@
 VITE_SUPABASE_URL='https://127.0.0.1:54321'
-VITE_SUPABASE_ANON_KEY='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0'
-SUPABASE_SERVICE_ROLE_KEY='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RAZx35lJzdJsyH-qQwv8Hdp7fsn3W0YpN81IU'
-SUPABASE_JWT_SECRET='super-secret-jwt-token-with-at-least-32-characters-long'
+VITE_SUPABASE_PUBLISHABLE_KEY='sb_publishable_ACJWlzQHlZjBrEguHvfOxg_3BJgxAaH'
+SUPABASE_SECRET_KEY='sb_secret_N7UND0UgjKTVK-Uodkm0Hg_xSvEMPvz'
 VITE_OPEN_SECRET_CLIENT_ID='a5e351d4-6dd9-4ee6-8e36-f5fb871e5432'
 VITE_OPEN_SECRET_API_URL='https://enclave.trymaple.ai'
 VITE_SENTRY_HOST='o4509706567680000.ingest.us.sentry.io'
diff --git a/app/features/agicash-db/database.client.ts b/app/features/agicash-db/database.client.ts
index 1ed6bed0..f4fed28c 100644
--- a/app/features/agicash-db/database.client.ts
+++ b/app/features/agicash-db/database.client.ts
@@ -26,9 +26,10 @@ const getSupabaseUrl = () => {
 
 const supabaseUrl = getSupabaseUrl();
 
-const supabaseAnonKey = import.meta.env.VITE_SUPABASE_ANON_KEY ?? '';
-if (!supabaseAnonKey) {
-  throw new Error('VITE_SUPABASE_ANON_KEY is not set');
+const supabasePublishableKey =
+  import.meta.env.VITE_SUPABASE_PUBLISHABLE_KEY ?? '';
+if (!supabasePublishableKey) {
+  throw new Error('VITE_SUPABASE_PUBLISHABLE_KEY is not set');
 }
 
 /**
@@ -37,7 +38,7 @@ if (!supabaseAnonKey) {
  */
 export const agicashDbClient = createClient<Database>(
   supabaseUrl,
-  supabaseAnonKey,
+  supabasePublishableKey,
   {
     accessToken: getSupabaseSessionToken,
     db: {
diff --git a/app/features/agicash-db/database.server.ts b/app/features/agicash-db/database.server.ts
index c4110d5e..3360419a 100644
--- a/app/features/agicash-db/database.server.ts
+++ b/app/features/agicash-db/database.server.ts
@@ -6,9 +6,9 @@ if (!supabaseUrl) {
   throw new Error('VITE_SUPABASE_URL is not set');
 }
 
-const supabaseServiceRoleKey = process.env.SUPABASE_SERVICE_ROLE_KEY ?? '';
-if (!supabaseServiceRoleKey) {
-  throw new Error('SUPABASE_SERVICE_ROLE_KEY is not set');
+const supabaseSecretKey = process.env.SUPABASE_SECRET_KEY ?? '';
+if (!supabaseSecretKey) {
+  throw new Error('SUPABASE_SECRET_KEY is not set');
 }
 
 /**
@@ -17,7 +17,7 @@ if (!supabaseServiceRoleKey) {
  */
 export const agicashDbServer = createClient<Database>(
   supabaseUrl,
-  supabaseServiceRoleKey,
+  supabaseSecretKey,
   {
     db: {
       schema: 'wallet',
diff --git a/vite-env.d.ts b/vite-env.d.ts
index 994fa49f..76304c4f 100644
--- a/vite-env.d.ts
+++ b/vite-env.d.ts
@@ -9,7 +9,7 @@ interface ViteTypeOptions {
 
 interface ImportMetaEnv {
   readonly VITE_SUPABASE_URL: string | undefined;
-  readonly VITE_SUPABASE_ANON_KEY: string | undefined;
+  readonly VITE_SUPABASE_PUBLISHABLE_KEY: string | undefined;
   readonly VITE_OPEN_SECRET_API_URL: string | undefined;
   readonly VITE_OPEN_SECRET_CLIENT_ID: string | undefined;
   readonly VITE_SENTRY_HOST: string | undefined;