diff --git a/server/tellme.service b/server/tellme.service
index eb3c4cd..a2c2393 100644
--- a/server/tellme.service
+++ b/server/tellme.service
@@ -6,7 +6,7 @@ After=network.target
 User=cgsserver
 WorkingDirectory=/opt/tellme
 Environment=FLASK_CONFIG=production
-ExecStart=gunicorn -b 0.0.0.0:8080 --preload --workers=1 --threads=1 -t 300 --access-logfile /var/log/tellme/access.log --error-logfile /var/log/tellme/error.log tellmesrv:app
+ExecStart=waitress-serve --host=0.0.0.0 --port=8080 tellmesrv:app
 Restart=always
 
 [Install]