diff --git a/Dockerfile b/Dockerfile
index 5715bb6..e2b4d55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,3 +40,5 @@ RUN set -euo pipefail; chmod +x /usr/local/bin/docker-entrypoint.sh; \
     sed -ri "s|^#?(listen_addresses)\s*=\s*\S+.*|\1 = '*'|" /usr/share/postgresql12/postgresql.conf.sample
 
 STOPSIGNAL SIGINT
+HEALTHCHECK --interval=10s --start-period=10s --timeout=5s \
+    CMD pg_isready -U ${POSTGRES_USER:-postgres} -h localhost -p 5432
diff --git a/postgres-12-image.changes b/postgres-12-image.changes
index e816b81..0e73a9f 100644
--- a/postgres-12-image.changes
+++ b/postgres-12-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 13 11:26:06 UTC 2023 - Dan Čermák <dcermak@suse.com>
+
+- Add Healthcheck
+
 -------------------------------------------------------------------
 Thu Mar  9 16:27:16 UTC 2023 - Dan Čermák <dcermak@suse.com>