diff --git a/.env b/.env
index ab8b8a3..75d161c 100644
--- a/.env
+++ b/.env
@@ -4,6 +4,7 @@ SOLARDB_UI_HOST=db.northdanubesoft.eu
 UI_ORIGIN=https://db.northdanubesoft.eu
 
 LETSENCRYPT_EMAIL=macamete.robert@gmail.com
+API_BASE_URL= https://db-api.northdanubesoft.eu
 
 # Flask
 FLASK_ENV=production
diff --git a/client/pages/home/application_page.py b/client/pages/home/application_page.py
index ef3f3e9..ba9362c 100644
--- a/client/pages/home/application_page.py
+++ b/client/pages/home/application_page.py
@@ -2,6 +2,9 @@ import flet as ft
 from models.applications import DBApplications
 import json
 import requests
+import os
+
+API_BASE_URL = os.getenv("API_BASE_URL", "http://127.0.0.1:5001")
 
 class ApplicationPage:
     def __init__(self, page: ft.Page, dashboard, app):
@@ -72,7 +75,7 @@ class ApplicationPage:
         self.data_details.update()
     
     def get_data(self):
-        response = requests.post('http://127.0.0.1:5001/get_all')
+        response = requests.post(f"{API_BASE_URL}/get_all")
         return json.loads(response.text) if response.status_code == 200 else []
     
     def create_list(self, items, on_click_handler):
@@ -98,7 +101,7 @@ class ApplicationPage:
         if data:
             document = {"doc":data}
             print(document)
-            requests.post('http://127.0.0.1:5001/insert', json=json.dumps(document))
+            requests.post(f"{API_BASE_URL}/insert", json=json.dumps(document))
             self.refresh_list('')
         self.editor.value = ''
         self.editor.update()
@@ -120,7 +123,7 @@ class ApplicationPage:
             }
             
         if self.update_doc_id or self.query_field.value:
-            response = requests.post('http://127.0.0.1:5001/update', json=json.dumps(json_file))
+            response = requests.post(f"{API_BASE_URL}/update", json=json.dumps(json_file))
             print(response.text)
             result = json.loads(response.text) if response.status_code == 200 else []
             self.refresh_list('')
@@ -139,7 +142,7 @@ class ApplicationPage:
                 "doc_id": int(self.update_doc_id.value),
             }
         if self.update_doc_id or self.query_field.value:
-            response = requests.post('http://127.0.0.1:5001/remove', json=json.dumps(json_file))
+            response = requests.post(f"{API_BASE_URL}/remove", json=json.dumps(json_file))
             print(response.text)
             result = json.loads(response.text) if response.status_code == 200 else []
             self.refresh_list('')
@@ -154,7 +157,7 @@ class ApplicationPage:
             }
         }
         if self.query_field.value and self.query_value.value:
-            response = requests.post('http://127.0.0.1:5001/search', json=json.dumps(json_file))
+            response = requests.post(f"{API_BASE_URL}/search", json=json.dumps(json_file))
             print(response.text)
             result = json.loads(response.text) if response.status_code == 200 else []
             self.data_list.controls.clear()