diff --git a/docker/README.md b/docker/README.md
index 4fae0d674..332dd6d08 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -6,6 +6,11 @@ The Docker image of Trino Gateway is designed for the following use cases:
 * Automated usage with an orchestration system like Kubernetes to simplify
   deployment
 
+## Production setup
+
+The healthcheck configurations in the `docker-compose` file is for suitable for development and testing purposes only.
+Change the configuration for your production deployment based on the workload and your specific requirements.
+
 ## Build requirements
 
 This docker build process requires the following software:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 0fe3d7552..c0053a6ff 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -6,6 +6,7 @@ services:
       postgres:
         condition: service_healthy
     healthcheck:
+      test: ["CMD-SHELL", "/usr/lib/trino/bin/health-check || exit 1"]
       interval: 5s
       timeout: 5s
       retries: 60