diff --git a/deployment/zaqar/zaqar-container-puppet.yaml b/deployment/zaqar/zaqar-container-puppet.yaml
index f295b90006..60f5275865 100644
--- a/deployment/zaqar/zaqar-container-puppet.yaml
+++ b/deployment/zaqar/zaqar-container-puppet.yaml
@@ -304,6 +304,8 @@ outputs:
                 # NOTE(mandre) kolla image changes the user to 'zaqar', we need it
                 # to be root to run httpd
                 user: root
+                healthcheck:
+                  test: /usr/share/openstack-tripleo-common/healthcheck/zaqar-api
                 volumes:
                   list_concat:
                     - {get_attr: [ContainersCommon, volumes]}
@@ -329,6 +331,12 @@ outputs:
                 net: host
                 privileged: false
                 restart: always
+                healthcheck:
+                  test:
+                    list_join:
+                      - ' '
+                      - - '/usr/share/openstack-tripleo-common/healthcheck/zaqar-api'
+                        - {get_param: [EndpointMap, ZaqarWebSocketInternal, port]}
                 volumes:
                   list_concat:
                     - {get_attr: [ContainersCommon, volumes]}