diff --git a/10/Dockerfile b/10/Dockerfile
index 0e559f36b2..5e0af48ca0 100644
--- a/10/Dockerfile
+++ b/10/Dockerfile
@@ -172,5 +172,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile
index 76c5c5f618..04da9c78d0 100644
--- a/10/alpine/Dockerfile
+++ b/10/alpine/Dockerfile
@@ -150,5 +150,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/11/Dockerfile b/11/Dockerfile
index 29af4398b4..f07bb98c62 100644
--- a/11/Dockerfile
+++ b/11/Dockerfile
@@ -172,5 +172,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile
index 2bf84e901c..366aa3f920 100644
--- a/11/alpine/Dockerfile
+++ b/11/alpine/Dockerfile
@@ -150,5 +150,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/12/Dockerfile b/12/Dockerfile
index b1da1dbe45..d56bea6a46 100644
--- a/12/Dockerfile
+++ b/12/Dockerfile
@@ -172,5 +172,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile
index f61108292b..3975c85466 100644
--- a/12/alpine/Dockerfile
+++ b/12/alpine/Dockerfile
@@ -149,5 +149,7 @@ VOLUME /var/lib/postgresql/data
 COPY docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/9.4/Dockerfile b/9.4/Dockerfile
index f31ff3e837..6bf1428990 100644
--- a/9.4/Dockerfile
+++ b/9.4/Dockerfile
@@ -173,5 +173,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/9.4/alpine/Dockerfile b/9.4/alpine/Dockerfile
index 97c7a48be4..5e23ef7b3e 100644
--- a/9.4/alpine/Dockerfile
+++ b/9.4/alpine/Dockerfile
@@ -148,5 +148,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/9.5/Dockerfile b/9.5/Dockerfile
index 8645cb43bd..2f7dd7bcd5 100644
--- a/9.5/Dockerfile
+++ b/9.5/Dockerfile
@@ -173,5 +173,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/9.5/alpine/Dockerfile b/9.5/alpine/Dockerfile
index 7cfaaad99f..4be0bfe1e4 100644
--- a/9.5/alpine/Dockerfile
+++ b/9.5/alpine/Dockerfile
@@ -148,5 +148,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/9.6/Dockerfile b/9.6/Dockerfile
index 32bcf4ec76..e0d50d2d40 100644
--- a/9.6/Dockerfile
+++ b/9.6/Dockerfile
@@ -173,5 +173,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/9.6/alpine/Dockerfile b/9.6/alpine/Dockerfile
index e349927093..4d4cd93caa 100644
--- a/9.6/alpine/Dockerfile
+++ b/9.6/alpine/Dockerfile
@@ -148,5 +148,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 217c60ffbc..4365027063 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -150,5 +150,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 5fc9727e1b..b5022b54e1 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -173,5 +173,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]