diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3e3d7b35..bace8945 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -19,13 +19,14 @@ RUN python -m pip install --upgrade pip \
 FROM python:3.10.12-slim-bullseye
 
 COPY --from=build_tarball /terracotta/dist/terracotta-*.tar.gz /terracotta/terracotta.tar.gz
-COPY --from=build_tarball /entrypoint.sh /entrypoint.sh
 
 RUN pip install --upgrade pip \
-    && pip install psycopg2-binary \
+    && pip install psycopg2-binary gunicorn \
     && pip install /terracotta/terracotta.tar.gz \
     && rm -rf /terracotta
 
+COPY --from=build_tarball /entrypoint.sh /entrypoint.sh
+
 ENV TC_SERVER_PORT=5000
 EXPOSE $TC_SERVER_PORT
 
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index c966f89b..5ef6a58b 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -1,3 +1,12 @@
 #!/bin/sh
 
-terracotta serve --allow-all-ips --port $TC_SERVER_PORT -d $TC_DRIVER_PATH
+
+# Validate that environment variables are set
+if [ -z "$TC_DRIVER_PATH" ]; then
+  echo "TC_DRIVER_PATH is not set. Exiting."
+  exit 1
+fi
+
+
+# Start the server
+gunicorn terracotta.server.app:app --bind 0.0.0.0:$TC_SERVER_PORT