diff --git a/requirements.txt b/requirements.txt
index 7dd3a441f..be26d94cd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -185,6 +185,7 @@ tzdata==2025.2
 uritemplate==4.1.1
 urllib3==2.3.0
 uvicorn==0.34.2
+waitress==3.0.2
 wavedrom==2.0.3.post3
 wcwidth==0.2.13
 Werkzeug==3.1.3
diff --git a/src/api/controller.py b/src/api/controller.py
index dbf31c400..17afef7f0 100644
--- a/src/api/controller.py
+++ b/src/api/controller.py
@@ -1,5 +1,6 @@
 import logging
 from flask import Flask, jsonify, request
+from waitress import serve
 from src.llm.llm import Phi3LanguageModel
 from src.llm.llm_rag import Phi3LanguageModelWithRag
 
@@ -20,4 +21,6 @@ if __name__ == '__main__':
     logger = logging.Logger(name='Flask API', level=logging.DEBUG)
     print('test')
     logger.debug('running...')
-    app.run(debug=True, port=9998)
\ No newline at end of file
+    
+    # Production mode with Waitress:
+    serve(app, host='0.0.0.0', port=9998)
\ No newline at end of file
diff --git a/src/api/server.py b/src/api/server.py
index 8db78c626..d4645a7fd 100644
--- a/src/api/server.py
+++ b/src/api/server.py
@@ -1,7 +1,7 @@
 import json
 import logging
 
-from tests.api.controller import ApiController
+from src.api.controller import ApiController
 from wsgiref.simple_server import make_server