diff --git a/src/config/api.config.ts b/src/config/api.config.ts
index 3b9033c..2734887 100644
--- a/src/config/api.config.ts
+++ b/src/config/api.config.ts
@@ -4,9 +4,9 @@
  */
 
 export const apiConfig = {
-  baseURL: import.meta.env.VITE_API_URL || 'http://localhost:4000',
+  baseURL: import.meta.env.VITE_API_URL || import.meta.env.VITE_INDEEHUB_API_URL || 'http://localhost:4000',
   timeout: Number(import.meta.env.VITE_API_TIMEOUT) || 30000,
-  cdnURL: import.meta.env.VITE_CDN_URL || '',
+  cdnURL: import.meta.env.VITE_CDN_URL || import.meta.env.VITE_INDEEHUB_CDN_URL || '',
   enableRetry: true,
   maxRetries: 3,
   retryDelay: 1000,
diff --git a/src/utils/mock.ts b/src/utils/mock.ts
index ac3ff9a..315b517 100644
--- a/src/utils/mock.ts
+++ b/src/utils/mock.ts
@@ -32,7 +32,7 @@ export async function initMockMode(): Promise<void> {
   // Nothing to check if mock is already on
   if (USE_MOCK) return
 
-  const apiUrl = import.meta.env.VITE_API_URL || 'http://localhost:4000'
+  const apiUrl = import.meta.env.VITE_API_URL || import.meta.env.VITE_INDEEHUB_API_URL || 'http://localhost:4000'
 
   try {
     const controller = new AbortController()