diff --git a/bitnami/postgresql-ha/16/Dockerfile b/bitnami/postgresql-ha/16/Dockerfile
new file mode 100644
index 00000000..278dff5a
--- /dev/null
+++ b/bitnami/postgresql-ha/16/Dockerfile
@@ -0,0 +1,5 @@
+FROM bitnami/postgresql-repmgr:16.0.0
+
+# Health check and non-privileged user
+HEALTHCHECK --interval=15s --timeout=5s --retries=3 CMD [ "pg_isready" ]
+USER postgres