diff --git a/Dockerfile b/Dockerfile
index ceab119..cb6eea8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,8 @@ COPY pyproject.toml poetry.lock ./
 FROM stage as firedust-dev
 
 ENV PATH="/home/vscode/local/bin:$PATH" \
-    ENV="local"
+    ENV="local" \
+    FIREDUST_API_URL="http://localhost:8000"
 
 # Install development dependencies
 RUN apt-get update && \
diff --git a/pyproject.toml b/pyproject.toml
index 5dafc15..ba332bd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "firedust"
-version = "0.0.59"
+version = "0.0.60"
 description = "A simple framework to build and deploy AI tools."
 authors = ["ion <firedvst@gmail.com>"]
 readme = "README.md"
diff --git a/src/firedust/utils/api.py b/src/firedust/utils/api.py
index 7207e2c..38b266a 100644
--- a/src/firedust/utils/api.py
+++ b/src/firedust/utils/api.py
@@ -6,8 +6,8 @@
 
 from firedust.utils.errors import MissingFiredustKeyError
 
-# BASE_URL = "https://api.firedust.dev"
-BASE_URL = "http://localhost:8000"
+# Use environment variable with fallback to production URL
+BASE_URL = os.getenv("FIREDUST_API_URL", "https://api.firedust.dev")
 TIMEOUT = 300
 
 
diff --git a/tests/assistant/test_chat.py b/tests/assistant/test_chat.py
index 749d2c4..f20db07 100644
--- a/tests/assistant/test_chat.py
+++ b/tests/assistant/test_chat.py
@@ -1,7 +1,6 @@
 import os
 import random
 
-from datetime import datetime
 import pytest
 
 import firedust