diff --git a/2.1/Dockerfile b/2.1/Dockerfile
index e7b3f48..5b71fcf 100644
--- a/2.1/Dockerfile
+++ b/2.1/Dockerfile
@@ -36,6 +36,8 @@ ENV CASSANDRA_CONFIG /etc/cassandra
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 ENTRYPOINT ["/docker-entrypoint.sh"]
 
+HEALTHCHECK --interval=3s --timeout=1s CMD cqlsh -e "use system"
+
 RUN mkdir -p /var/lib/cassandra "$CASSANDRA_CONFIG" \
 	&& chown -R cassandra:cassandra /var/lib/cassandra "$CASSANDRA_CONFIG" \
 	&& chmod 777 /var/lib/cassandra "$CASSANDRA_CONFIG"
diff --git a/2.2/Dockerfile b/2.2/Dockerfile
index 26552a7..c4534de 100644
--- a/2.2/Dockerfile
+++ b/2.2/Dockerfile
@@ -36,6 +36,8 @@ ENV CASSANDRA_CONFIG /etc/cassandra
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 ENTRYPOINT ["/docker-entrypoint.sh"]
 
+HEALTHCHECK --interval=3s --timeout=1s CMD cqlsh -e "use system"
+
 RUN mkdir -p /var/lib/cassandra "$CASSANDRA_CONFIG" \
 	&& chown -R cassandra:cassandra /var/lib/cassandra "$CASSANDRA_CONFIG" \
 	&& chmod 777 /var/lib/cassandra "$CASSANDRA_CONFIG"
diff --git a/3.0/Dockerfile b/3.0/Dockerfile
index dd7068c..3f1da97 100644
--- a/3.0/Dockerfile
+++ b/3.0/Dockerfile
@@ -36,6 +36,8 @@ ENV CASSANDRA_CONFIG /etc/cassandra
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 ENTRYPOINT ["/docker-entrypoint.sh"]
 
+HEALTHCHECK --interval=3s --timeout=1s CMD cqlsh -e "use system"
+
 RUN mkdir -p /var/lib/cassandra "$CASSANDRA_CONFIG" \
 	&& chown -R cassandra:cassandra /var/lib/cassandra "$CASSANDRA_CONFIG" \
 	&& chmod 777 /var/lib/cassandra "$CASSANDRA_CONFIG"
diff --git a/3.7/Dockerfile b/3.7/Dockerfile
index 071ffa6..f9cbb82 100644
--- a/3.7/Dockerfile
+++ b/3.7/Dockerfile
@@ -36,6 +36,8 @@ ENV CASSANDRA_CONFIG /etc/cassandra
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 ENTRYPOINT ["/docker-entrypoint.sh"]
 
+HEALTHCHECK --interval=3s --timeout=1s CMD cqlsh -e "use system"
+
 RUN mkdir -p /var/lib/cassandra "$CASSANDRA_CONFIG" \
 	&& chown -R cassandra:cassandra /var/lib/cassandra "$CASSANDRA_CONFIG" \
 	&& chmod 777 /var/lib/cassandra "$CASSANDRA_CONFIG"
diff --git a/Dockerfile.template b/Dockerfile.template
index 97c097f..f61c43f 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -36,6 +36,8 @@ ENV CASSANDRA_CONFIG /etc/cassandra
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 ENTRYPOINT ["/docker-entrypoint.sh"]
 
+HEALTHCHECK --interval=3s --timeout=1s CMD cqlsh -e "use system"
+
 RUN mkdir -p /var/lib/cassandra "$CASSANDRA_CONFIG" \
 	&& chown -R cassandra:cassandra /var/lib/cassandra "$CASSANDRA_CONFIG" \
 	&& chmod 777 /var/lib/cassandra "$CASSANDRA_CONFIG"