diff --git a/docker/light-ui/Dockerfile b/docker/light-ui/Dockerfile
index 29cbb74..2558834 100644
--- a/docker/light-ui/Dockerfile
+++ b/docker/light-ui/Dockerfile
@@ -28,11 +28,12 @@
 RUN rm -f db.sqlite3
 
 ENV DJANGO_ENV=prod
-RUN python manage.py makemigrations authosm
-RUN python manage.py migrate
 RUN python manage.py collectstatic --noinput
-
+RUN chmod +x /usr/share/osm-lightui/entrypoint.sh
 
 EXPOSE 80
 
-CMD ["supervisord", "-n"]
+HEALTHCHECK --start-period=130s --interval=10s --timeout=5s --retries=12 \
+  CMD curl --silent --fail localhost:80 || exit 1
+
+CMD ["/usr/share/osm-lightui/entrypoint.sh"]
diff --git a/installers/osm_health.sh b/installers/osm_health.sh
index 1a9dc7d..bde1a6a 100755
--- a/installers/osm_health.sh
+++ b/installers/osm_health.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 WAIT_TIME=340  # LCM healthcheck needs 2x(30+140) senconds
-SERVICES_WITH_HEALTH="nbi ro zookeeper lcm mon"
+SERVICES_WITH_HEALTH="nbi ro zookeeper lcm mon light-ui"
 NUM_SERVICES_WITH_HEALTH=$(echo $SERVICES_WITH_HEALTH | wc -w)
 WAIT_FINAL=30