diff --git a/app/__init__.py b/app/__init__.py
index ef8b4b2..057579e 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -25,21 +25,6 @@ from .storage import ObjectStorage
 from .version import get_version
 
 
-class ServerHeaderMiddleware:
-    def __init__(self, app, server_name):
-        self.app = app
-        self.server_name = server_name
-
-    def __call__(self, environ, start_response):
-        def custom_start_response(status, headers, exc_info=None):
-            # Remove existing Server header if present
-            headers = [(name, value) for name, value in headers if name.lower() != 'server']
-            headers.append(('Server', self.server_name))
-            return start_response(status, headers, exc_info)
-
-        return self.app(environ, custom_start_response)
-
-
 def create_app(
     test_config: Optional[Dict[str, Any]] = None,
     *,
@@ -65,7 +50,6 @@ def create_app(
 
     # Trust X-Forwarded-* headers from proxies
     app.wsgi_app = ProxyFix(app.wsgi_app, x_for=1, x_proto=1, x_host=1, x_prefix=1)
-    app.wsgi_app = ServerHeaderMiddleware(app.wsgi_app, "MyFSIO")
 
     _configure_cors(app)
     _configure_logging(app)
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 6fbaf2e..90d68a4 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -2,7 +2,7 @@
 set -e
 
 # Start API server in background
-gunicorn "app:create_api_app()" --bind 0.0.0.0:5000 --workers 4 --access-logfile - &
+waitress-serve --ident=MyFSIO --listen=*:5000 --call app:create_api_app &
 
 # Start UI server in foreground
-gunicorn "app:create_ui_app()" --bind 0.0.0.0:5100 --workers 4 --access-logfile -
+waitress-serve --ident=MyFSIO --listen=*:5100 --call app:create_ui_app
diff --git a/requirements.txt b/requirements.txt
index 7697a50..43f1ae7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,4 +5,4 @@ Flask-WTF>=1.2.1
 pytest>=7.4
 requests>=2.31
 boto3>=1.34
-gunicorn>=21.2.0
+waitress>=2.1.2