diff --git a/src/main.astro b/src/main.astro
index d5df3176..a4fcae67 100644
--- a/src/main.astro
+++ b/src/main.astro
@@ -6,7 +6,7 @@ import { t } from './utils/intl'
 // Setting locale for prerendered content here
 
 const lang = Astro.url.searchParams.get('lang') || 'ru'
-console.log('[layout] server locale is', lang)
+console.log('[main.astro] astro runtime locale is', lang)
 setLocale(lang)
 
 ---
diff --git a/src/utils/config.ts b/src/utils/config.ts
index 1e795ef8..ecb7be64 100644
--- a/src/utils/config.ts
+++ b/src/utils/config.ts
@@ -1,2 +1,6 @@
 export const isDev = import.meta.env.VERCEL_ENV !== 'production'
-export const apiBaseUrl = import.meta.env.API_URL || import.meta.env.VITE_API_URL || 'http://localhost:8080'
+export const apiBaseUrl =
+  import.meta.env.PUBLIC_API_URL ||
+  import.meta.env.API_URL ||
+  import.meta.env.VITE_API_URL ||
+  'http://localhost:8080'