diff --git a/password_wallet_api.py b/password_wallet_api.py
index 2ff292f..1aa23dd 100644
--- a/password_wallet_api.py
+++ b/password_wallet_api.py
@@ -6,6 +6,7 @@ import base64
 import hashlib
 import logging
 from cryptography.fernet import Fernet
+from waitress import serve
 
 # Configurazione
 db_file = "data/passwords.db"
@@ -196,4 +197,5 @@ def list_sites_api():
 # Avvio dell'app
 if __name__ == '__main__':
     init_db()
-    app.run(host='0.0.0.0', port=5000)
+    #app.run(host='0.0.0.0', port=5000)
+    serve(app, host='0.0.0.0', port=5000)
diff --git a/pyproject.toml b/pyproject.toml
index 0f5488c..5b84261 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,4 +10,5 @@ dependencies = [
     "flask>=3.1.0",
     "paho-mqtt>=2.1.0",
     "requests>=2.32.3",
+    "waitress>=3.0.2",
 ]
diff --git a/uv.lock b/uv.lock
index 03cffaa..176a92e 100644
--- a/uv.lock
+++ b/uv.lock
@@ -11,6 +11,7 @@ dependencies = [
     { name = "flask" },
     { name = "paho-mqtt" },
     { name = "requests" },
+    { name = "waitress" },
 ]
 
 [package.metadata]
@@ -20,6 +21,7 @@ requires-dist = [
     { name = "flask", specifier = ">=3.1.0" },
     { name = "paho-mqtt", specifier = ">=2.1.0" },
     { name = "requests", specifier = ">=2.32.3" },
+    { name = "waitress", specifier = ">=3.0.2" },
 ]
 
 [[package]]
@@ -320,6 +322,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/c8/19/4ec628951a74043532ca2cf5d97b7b14863931476d117c471e8e2b1eb39f/urllib3-2.3.0-py3-none-any.whl", hash = "sha256:1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df", size = 128369 },
 ]
 
+[[package]]
+name = "waitress"
+version = "3.0.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/bf/cb/04ddb054f45faa306a230769e868c28b8065ea196891f09004ebace5b184/waitress-3.0.2.tar.gz", hash = "sha256:682aaaf2af0c44ada4abfb70ded36393f0e307f4ab9456a215ce0020baefc31f", size = 179901 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/8d/57/a27182528c90ef38d82b636a11f606b0cbb0e17588ed205435f8affe3368/waitress-3.0.2-py3-none-any.whl", hash = "sha256:c56d67fd6e87c2ee598b76abdd4e96cfad1f24cacdea5078d382b1f9d7b5ed2e", size = 56232 },
+]
+
 [[package]]
 name = "werkzeug"
 version = "3.1.3"