diff --git a/docker/ubi8/Dockerfile b/docker/ubi8/Dockerfile
index 015123e94e..f0b12e3d4c 100644
--- a/docker/ubi8/Dockerfile
+++ b/docker/ubi8/Dockerfile
@@ -57,4 +57,5 @@ RUN chmod -R 777 /etc/pki/tls/certs
 RUN chmod -R 777 /var/
 RUN chown -R spinnaker:spinnaker /var
 USER spinnaker
+HEALTHCHECK CMD curl --fail http://localhost:7002/health
 CMD  sleep 180s ; "/opt/clouddriver/bin/clouddriver"
diff --git a/docker/ubi8/Dockerfile-dev b/docker/ubi8/Dockerfile-dev
index 8b48a2e879..368ace2a8e 100644
--- a/docker/ubi8/Dockerfile-dev
+++ b/docker/ubi8/Dockerfile-dev
@@ -110,6 +110,7 @@ RUN chmod -R 777 /etc/pki/tls/certs
 RUN chmod -R 777 /var/
 RUN chown -R spinnaker:spinnaker /var
 USER spinnaker
+HEALTHCHECK CMD curl --fail http://localhost:7002/health
 ENV SLEEP_TIME=10s
 CMD  sleep $SLEEP_TIME ; "/opt/clouddriver/bin/clouddriver"
 #CMD  sleep 180s ; "/opt/clouddriver/bin/clouddriver"
diff --git a/docker/ubi8/Dockerfile-fips b/docker/ubi8/Dockerfile-fips
index 4326fe5e9f..331742a102 100644
--- a/docker/ubi8/Dockerfile-fips
+++ b/docker/ubi8/Dockerfile-fips
@@ -108,5 +108,6 @@ RUN chmod -R 777 /etc/pki/tls/certs
 RUN chmod -R 777 /var/
 RUN chown -R spinnaker:spinnaker /var
 USER spinnaker
+HEALTHCHECK CMD curl --fail http://localhost:7002/health
 ENV SLEEP_TIME=10s
 CMD  sleep $SLEEP_TIME ; "/opt/clouddriver/bin/clouddriver"