diff --git a/6.2/alpine/Dockerfile b/6.2/alpine/Dockerfile
index 43d02e104..ad871d8d8 100644
--- a/6.2/alpine/Dockerfile
+++ b/6.2/alpine/Dockerfile
@@ -139,3 +139,7 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 
 EXPOSE 6379
 CMD ["redis-server"]
+
+# Search for "PONG" instead of relying on the exit status because of
+# https://stackoverflow.com/a/71504657/815742.
+HEALTHCHECK --start-period=1s CMD redis-cli ping | grep ^PONG$
diff --git a/6.2/debian/Dockerfile b/6.2/debian/Dockerfile
index 7f3c1c754..73c26e7db 100644
--- a/6.2/debian/Dockerfile
+++ b/6.2/debian/Dockerfile
@@ -148,3 +148,7 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 
 EXPOSE 6379
 CMD ["redis-server"]
+
+# Search for "PONG" instead of relying on the exit status because of
+# https://stackoverflow.com/a/71504657/815742.
+HEALTHCHECK --start-period=1s CMD redis-cli ping | grep ^PONG$
diff --git a/7.0/alpine/Dockerfile b/7.0/alpine/Dockerfile
index 80aaa20b7..0972cf41f 100644
--- a/7.0/alpine/Dockerfile
+++ b/7.0/alpine/Dockerfile
@@ -139,3 +139,7 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 
 EXPOSE 6379
 CMD ["redis-server"]
+
+# Search for "PONG" instead of relying on the exit status because of
+# https://stackoverflow.com/a/71504657/815742.
+HEALTHCHECK --start-period=1s CMD redis-cli ping | grep ^PONG$
diff --git a/7.0/debian/Dockerfile b/7.0/debian/Dockerfile
index d252fa65c..d3651d17c 100644
--- a/7.0/debian/Dockerfile
+++ b/7.0/debian/Dockerfile
@@ -148,3 +148,7 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 
 EXPOSE 6379
 CMD ["redis-server"]
+
+# Search for "PONG" instead of relying on the exit status because of
+# https://stackoverflow.com/a/71504657/815742.
+HEALTHCHECK --start-period=1s CMD redis-cli ping | grep ^PONG$
diff --git a/7.2/alpine/Dockerfile b/7.2/alpine/Dockerfile
index 19304a8d4..bb349c11f 100644
--- a/7.2/alpine/Dockerfile
+++ b/7.2/alpine/Dockerfile
@@ -139,3 +139,7 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 
 EXPOSE 6379
 CMD ["redis-server"]
+
+# Search for "PONG" instead of relying on the exit status because of
+# https://stackoverflow.com/a/71504657/815742.
+HEALTHCHECK --start-period=1s CMD redis-cli ping | grep ^PONG$
diff --git a/7.2/debian/Dockerfile b/7.2/debian/Dockerfile
index 3e2fbd135..09ea3ffcc 100644
--- a/7.2/debian/Dockerfile
+++ b/7.2/debian/Dockerfile
@@ -148,3 +148,7 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 
 EXPOSE 6379
 CMD ["redis-server"]
+
+# Search for "PONG" instead of relying on the exit status because of
+# https://stackoverflow.com/a/71504657/815742.
+HEALTHCHECK --start-period=1s CMD redis-cli ping | grep ^PONG$
diff --git a/7.4-rc/alpine/Dockerfile b/7.4-rc/alpine/Dockerfile
index 402c7bb93..be2d91b34 100644
--- a/7.4-rc/alpine/Dockerfile
+++ b/7.4-rc/alpine/Dockerfile
@@ -139,3 +139,7 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 
 EXPOSE 6379
 CMD ["redis-server"]
+
+# Search for "PONG" instead of relying on the exit status because of
+# https://stackoverflow.com/a/71504657/815742.
+HEALTHCHECK --start-period=1s CMD redis-cli ping | grep ^PONG$
diff --git a/7.4-rc/debian/Dockerfile b/7.4-rc/debian/Dockerfile
index 3f202ef71..48c951040 100644
--- a/7.4-rc/debian/Dockerfile
+++ b/7.4-rc/debian/Dockerfile
@@ -148,3 +148,7 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 
 EXPOSE 6379
 CMD ["redis-server"]
+
+# Search for "PONG" instead of relying on the exit status because of
+# https://stackoverflow.com/a/71504657/815742.
+HEALTHCHECK --start-period=1s CMD redis-cli ping | grep ^PONG$
diff --git a/7.4/alpine/Dockerfile b/7.4/alpine/Dockerfile
index 93cbf23e0..9af42303f 100644
--- a/7.4/alpine/Dockerfile
+++ b/7.4/alpine/Dockerfile
@@ -139,3 +139,7 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 
 EXPOSE 6379
 CMD ["redis-server"]
+
+# Search for "PONG" instead of relying on the exit status because of
+# https://stackoverflow.com/a/71504657/815742.
+HEALTHCHECK --start-period=1s CMD redis-cli ping | grep ^PONG$
diff --git a/7.4/debian/Dockerfile b/7.4/debian/Dockerfile
index eef66335d..65e71b4be 100644
--- a/7.4/debian/Dockerfile
+++ b/7.4/debian/Dockerfile
@@ -148,3 +148,7 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 
 EXPOSE 6379
 CMD ["redis-server"]
+
+# Search for "PONG" instead of relying on the exit status because of
+# https://stackoverflow.com/a/71504657/815742.
+HEALTHCHECK --start-period=1s CMD redis-cli ping | grep ^PONG$
diff --git a/Dockerfile.template b/Dockerfile.template
index 489f6102a..0b31a3afa 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -235,3 +235,7 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 
 EXPOSE 6379
 CMD ["redis-server"]
+
+# Search for "PONG" instead of relying on the exit status because of
+# https://stackoverflow.com/a/71504657/815742.
+HEALTHCHECK --start-period=1s CMD redis-cli ping | grep ^PONG$