diff --git a/15.0/Dockerfile b/15.0/Dockerfile
index cb17c4174..bd3626f95 100644
--- a/15.0/Dockerfile
+++ b/15.0/Dockerfile
@@ -75,6 +75,7 @@ VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
 
 # Expose Odoo services
 EXPOSE 8069 8071 8072
+HEALTHCHECK CMD curl --fail http://localhost:8069/web/health && curl --fail http://localhost:8072/longpolling/health || exit 1
 
 # Set the default config file
 ENV ODOO_RC /etc/odoo/odoo.conf
diff --git a/16.0/Dockerfile b/16.0/Dockerfile
index b3d76ceea..c780c6cad 100644
--- a/16.0/Dockerfile
+++ b/16.0/Dockerfile
@@ -75,6 +75,7 @@ VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
 
 # Expose Odoo services
 EXPOSE 8069 8071 8072
+HEALTHCHECK CMD curl --fail http://localhost:8069/web/health && curl --fail http://localhost:8072/websocket/health || exit 1
 
 # Set the default config file
 ENV ODOO_RC /etc/odoo/odoo.conf