diff --git a/Dockerfile b/Dockerfile
index f1f16b3..2d2283e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.11.4-bullseye AS builder
+FROM python:3.11.5-bullseye AS builder
 
 RUN apt-get update && apt-get install -y apt-transport-https curl gnupg \
     && curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor >/usr/share/keyrings/bazel-archive-keyring.gpg \
@@ -15,7 +15,7 @@ RUN ["bazel", "build", "//wgkex/broker:app"]
 RUN ["bazel", "build", "//wgkex/worker:app"]
 RUN ["cp", "-rL", "bazel-bin", "bazel"]
 
-FROM python:3.11.3-bullseye
+FROM python:3.11.5-bullseye
 WORKDIR /wgkex
 
 COPY --from=builder /wgkex/bazel /wgkex/
diff --git a/requirements.txt b/requirements.txt
index 2652652..b16dec7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,6 +3,7 @@ flask-mqtt
 pyroute2
 PyYAML
 Flask
+waitress
 
 # Common
 ipaddress
diff --git a/wgkex/broker/BUILD b/wgkex/broker/BUILD
index 316c91a..260fe45 100644
--- a/wgkex/broker/BUILD
+++ b/wgkex/broker/BUILD
@@ -9,6 +9,7 @@ py_binary(
     deps=[
         requirement("flask"),
         requirement("flask-mqtt"),
+        requirement("waitress"),
         "//wgkex/config:config",
     ],
 )
diff --git a/wgkex/broker/app.py b/wgkex/broker/app.py
index e82497b..5001dc3 100644
--- a/wgkex/broker/app.py
+++ b/wgkex/broker/app.py
@@ -13,6 +13,7 @@
 from flask_mqtt import Mqtt
 import paho.mqtt.client as mqtt_client
 
+from waitress import serve
 from wgkex.config import config
 from wgkex.common import logger
 
@@ -168,4 +169,4 @@ def is_valid_domain(domain: str) -> str:
         listen_host = listen_config.get("host")
         listen_port = listen_config.get("port")
 
-    app.run(host=listen_host, port=listen_port)
+    serve(app, host=listen_host, port=listen_port)