diff --git a/Dockerfile b/Dockerfile
index d53051a..4a3738b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,8 +14,6 @@ RUN apk add curl bash jq
 RUN pip install poetry
 RUN poetry install
 
-FROM base as dev
-
 # Expose development port
 EXPOSE 5000
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 15fa1cd..dd64cda 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,6 @@ services:
   senju:
     build:
       context: .
-      target: dev
     ports:
       - "127.0.0.1:5000:5000"
     volumes:
diff --git a/entrypoint.sh b/entrypoint.sh
index a0564d5..63c9f1f 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # First create a readable multiline string
 SYSTEM_PROMPT=$(cat <<EOF
@@ -65,4 +66,4 @@ CONF=$(jq -n --arg system "$SYSTEM_PROMPT" '{
 curl http://ollama:11434/api/pull -d '{"model": "phi3"}'
 curl http://ollama:11434/api/create -d "$CONF"
 cd /app
-poetry run sh -c 'flask --app senju/main run --host=0.0.0.0'
+poetry run sh -c 'waitress-serve --listen=*:5000 senju.main:app'
diff --git a/pyproject.toml b/pyproject.toml
index 688e449..c508217 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -13,6 +13,7 @@ dependencies = [
 	"requests (>=2.32.3,<3.0.0)",
 	"coverage (>=7.6.12,<8.0.0)",
 	"pytest-httpserver (>=1.1.2,<2.0.0)",
+	"waitress (>=3.0.2,<4.0.0)",
 ]