diff --git a/app/main.py b/app/main.py
index 550337f..0717938 100644
--- a/app/main.py
+++ b/app/main.py
@@ -1,7 +1,14 @@
 import sys
 import os
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
-from settings_dev import settings
+
+# Dynamically import settings based on MODE environment variable
+mode = os.environ.get('MODE', 'DEVELOPMENT').upper()
+if mode == 'PRODUCTION':
+    from settings_prod import settings
+else:
+    from settings_dev import settings
+
 import requests
 from fastapi import FastAPI, HTTPException, status
 from fastapi.middleware.cors import CORSMiddleware
diff --git a/app/voipms_client.py b/app/voipms_client.py
index 3b38f71..853636d 100644
--- a/app/voipms_client.py
+++ b/app/voipms_client.py
@@ -1,7 +1,13 @@
 import sys
 import os
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
-from settings_dev import settings
+
+# Dynamically import settings based on MODE environment variable
+mode = os.environ.get('MODE', 'DEVELOPMENT').upper()
+if mode == 'PRODUCTION':
+    from settings_prod import settings
+else:
+    from settings_dev import settings
 
 import requests
 from fastapi import HTTPException, status
@@ -146,4 +152,4 @@ def get_forwardings(phone_number: str = None):
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
             detail=f"An unexpected error occurred: {e} - Request params: {params}"
-        )
\ No newline at end of file
+        )
diff --git a/settings_prod.py b/settings_prod.py
index cec7fe6..d7e0d95 100644
--- a/settings_prod.py
+++ b/settings_prod.py
@@ -25,7 +25,10 @@ class ApplicationConfig:
 
     origins = [
     "https://oil.edwineames.com",
+    "https://apiphone.edwineames.com",
     "https://apiauto.edwineames.com",
+    "https://apioil.edwineames.com",
+    
     ]
         # VoIP.ms Credentials and Settings
     voipms_api_username = os.environ.get('VOIPMS_API_USERNAME')