diff --git a/deploy/docker/docker-compose.yaml b/deploy/docker/docker-compose.yaml
index 0ca4306556..4bf836f1f0 100644
--- a/deploy/docker/docker-compose.yaml
+++ b/deploy/docker/docker-compose.yaml
@@ -1,87 +1,58 @@
 version: "3"
 services:
-
-  ##
-  ## Start Lowcoder (all-in-one)
-  ##
   lowcoder-api-service:
     image: lowcoderorg/lowcoder-ce:latest
     container_name: lowcoder
     ports:
       - "3000:3000"
       - "3443:3443"
-    #  - "27017:27017"
     environment:
-      # Public base url
       LOWCODER_PUBLIC_URL: "http://localhost:3000/"
-      # enable services
       LOWCODER_REDIS_ENABLED: "true"
       LOWCODER_MONGODB_ENABLED: "true"
-      # 
-      # Set LOWCODER_MONGODB_EXPOSED to "true" and uncomment mongodb port
-      # to make internal mongo database accessible from host
-      #
       LOWCODER_MONGODB_EXPOSED: "false"
       LOWCODER_API_SERVICE_ENABLED: "true"
       LOWCODER_NODE_SERVICE_ENABLED: "true"
       LOWCODER_FRONTEND_ENABLED: "true"
-      # generic parameters
-      # Effective user and group IDs
       LOWCODER_PUID: "1000"
       LOWCODER_PGID: "1000"
-      # api-service parameters
       LOWCODER_MAX_ORGS_PER_USER: 100
       LOWCODER_MAX_MEMBERS_PER_ORG: 1000
       LOWCODER_MAX_GROUPS_PER_ORG: 100
       LOWCODER_MAX_APPS_PER_ORG: 1000
       LOWCODER_MAX_DEVELOPERS: 50
-      #LOWCODER_MONGODB_URL: "mongodb://lowcoder:secret123@mongodb/lowcoder?authSource=admin"
       LOWCODER_MONGODB_URL: "mongodb://localhost:27017/lowcoder?authSource=admin"
       LOWCODER_REDIS_URL: "redis://localhost:6379"
       LOWCODER_EMAIL_SIGNUP_ENABLED: "true"
       LOWCODER_EMAIL_AUTH_ENABLED: "true"
       LOWCODER_CREATE_WORKSPACE_ON_SIGNUP: "true"
-      #
-      # ! PLEASE CHANGE THESE TO SOMETHING UNIQUE !
-      # 
-      #    LOWCODER_DB_ENCRYPTION_PASSWORD and LOWCODER_DB_ENCRYPTION_SALT is used 
-      #    to encrypt sensitive data in database so it is important to change the defaults
-      #
       LOWCODER_DB_ENCRYPTION_PASSWORD: "lowcoder.org"
       LOWCODER_DB_ENCRYPTION_SALT: "lowcoder.org"
       LOWCODER_CORS_DOMAINS: "*"
-      #
-      # API-KEY secret - should be a string of at least 32 random characters
-      #    - on linux/mac, generate one eg. with: head /dev/urandom | head -c 30 | shasum -a 256
-      #
       LOWCODER_API_KEY_SECRET: "5a41b090758b39b226603177ef48d73ae9839dd458ccb7e66f7e7cc028d5a50b"
-      # api and node service parameters
       LOWCODER_PLUGINS_DIR: "../plugins"
       LOWCODER_API_RATE_LIMIT: 50
       LOWCODER_API_SERVICE_URL: "http://localhost:8080"
       LOWCODER_NODE_SERVICE_URL: "http://localhost:6060"
-      # frontend parameters
       LOWCODER_MAX_REQUEST_SIZE: 20m
       LOWCODER_MAX_QUERY_TIMEOUT: 120
       LOWCODER_WORKSPACE_MODE: SAAS
       LOWCODER_MARKETPLACE_PRIVATE_MODE: "true"
-      # Lowcoder notification emails setup
       LOWCODER_ADMIN_SMTP_HOST: localhost
       LOWCODER_ADMIN_SMTP_PORT: 587
-      LOWCODER_ADMIN_SMTP_USERNAME: 
-      LOWCODER_ADMIN_SMTP_PASSWORD: 
       LOWCODER_ADMIN_SMTP_AUTH: "true"
       LOWCODER_ADMIN_SMTP_SSL_ENABLED: "false"
       LOWCODER_ADMIN_SMTP_STARTTLS_ENABLED: "true"
       LOWCODER_ADMIN_SMTP_STARTTLS_REQUIRED: "true"
-      # Email used as sender in lost password email
       LOWCODER_EMAIL_NOTIFICATIONS_SENDER: info@localhost
-      # Lowcoder superuser details
       LOWCODER_SUPERUSER_USERNAME: admin@localhost
-      # If left blank, a password will be generated and written into log (lowcoder-stacks/logs/api-service/api-service.log)
-      LOWCODER_SUPERUSER_PASSWORD: 
+      LOWCODER_SUPERUSER_PASSWORD:
     volumes:
       - ./lowcoder-stacks:/lowcoder-stacks
       - ./lowcoder-stacks/assets:/lowcoder/assets
     restart: unless-stopped
-
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:3000/ || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3