diff --git a/Dockerfile b/Dockerfile
index 03cbeea..0c1195c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM tecktron/python-bjoern:latest-slim
+FROM tecktron/python-waitress:slim
 
 RUN pip install --upgrade pip
 COPY ./requirements.txt .
diff --git a/docker_status/__main__.py b/docker_status/__main__.py
index caea527..63828c8 100644
--- a/docker_status/__main__.py
+++ b/docker_status/__main__.py
@@ -1,4 +1,4 @@
-import bjoern
+from waitress import serve
 from docker_status import app
 
-bjoern.run(app, "0.0.0.0", 1111)
+serve(app, listen='*:1111')
diff --git a/poetry.lock b/poetry.lock
index 50536e6..7f41418 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,15 +1,5 @@
 # This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand.
 
-[[package]]
-name = "bjoern"
-version = "3.2.2"
-description = "A screamingly fast Python 2 + 3 WSGI server written in C."
-optional = false
-python-versions = "*"
-files = [
-    {file = "bjoern-3.2.2.tar.gz", hash = "sha256:16e5a02a9a17a7f5f8bea0d7c58650e78ab80ead6fe3e390037573d4355baf31"},
-]
-
 [[package]]
 name = "blinker"
 version = "1.6.2"
@@ -354,6 +344,21 @@ secure = ["certifi", "cryptography (>=1.9)", "idna (>=2.0.0)", "pyopenssl (>=17.
 socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"]
 zstd = ["zstandard (>=0.18.0)"]
 
+[[package]]
+name = "waitress"
+version = "2.1.2"
+description = "Waitress WSGI server"
+optional = false
+python-versions = ">=3.7.0"
+files = [
+    {file = "waitress-2.1.2-py3-none-any.whl", hash = "sha256:7500c9625927c8ec60f54377d590f67b30c8e70ef4b8894214ac6e4cad233d2a"},
+    {file = "waitress-2.1.2.tar.gz", hash = "sha256:780a4082c5fbc0fde6a2fcfe5e26e6efc1e8f425730863c04085769781f51eba"},
+]
+
+[package.extras]
+docs = ["Sphinx (>=1.8.1)", "docutils", "pylons-sphinx-themes (>=1.0.9)"]
+testing = ["coverage (>=5.0)", "pytest", "pytest-cover"]
+
 [[package]]
 name = "websocket-client"
 version = "1.6.1"
@@ -390,4 +395,4 @@ watchdog = ["watchdog (>=2.3)"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.11"
-content-hash = "7b49838ba7ada1db17ba863aa5d6284cf5081f6f61bd38c1f170ce76d1b43719"
+content-hash = "5846197a062489b5886e4c72eb0c16b33c25c7bbf32e694d7443358901f16980"
diff --git a/pyproject.toml b/pyproject.toml
index 0a06eda..9defc75 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,8 +16,7 @@ docker = "^6.1.3"
 optional = true
 
 [tool.poetry.group.prod.dependencies]
-bjoern = "^3.2.2"
-
+waitress = "^2.1.2"
 
 [build-system]
 requires = ["poetry-core"]