diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index ea04b964..83938000 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        package: [bitnami/postgresql, postgres/postgres]
+        package: [bitnami/postgresql,bitnami/postgresql-ha, postgres/postgres]
         tag: [12, 13, 14, 15, 16]
     timeout-minutes: 10
     steps:
diff --git a/bitnami/postgresql-ha/12/Dockerfile b/bitnami/postgresql-ha/12/Dockerfile
new file mode 100644
index 00000000..7e7e6a14
--- /dev/null
+++ b/bitnami/postgresql-ha/12/Dockerfile
@@ -0,0 +1,5 @@
+FROM bitnami/postgresql-repmgr:12
+
+# Health check and non-privileged user
+HEALTHCHECK --interval=15s --timeout=5s --retries=3 CMD [ "pg_isready" ]
+USER postgres
diff --git a/bitnami/postgresql-ha/13/Dockerfile b/bitnami/postgresql-ha/13/Dockerfile
new file mode 100644
index 00000000..41a13f2d
--- /dev/null
+++ b/bitnami/postgresql-ha/13/Dockerfile
@@ -0,0 +1,5 @@
+FROM bitnami/postgresql-repmgr:13
+
+# Health check and non-privileged user
+HEALTHCHECK --interval=15s --timeout=5s --retries=3 CMD [ "pg_isready" ]
+USER postgres
diff --git a/bitnami/postgresql-ha/14/Dockerfile b/bitnami/postgresql-ha/14/Dockerfile
new file mode 100644
index 00000000..9519856f
--- /dev/null
+++ b/bitnami/postgresql-ha/14/Dockerfile
@@ -0,0 +1,5 @@
+FROM bitnami/postgresql-repmgr:14
+
+# Health check and non-privileged user
+HEALTHCHECK --interval=15s --timeout=5s --retries=3 CMD [ "pg_isready" ]
+USER postgres
diff --git a/bitnami/postgresql-ha/15/Dockerfile b/bitnami/postgresql-ha/15/Dockerfile
new file mode 100644
index 00000000..28e71887
--- /dev/null
+++ b/bitnami/postgresql-ha/15/Dockerfile
@@ -0,0 +1,5 @@
+FROM bitnami/postgresql-repmgr:15
+
+# Health check and non-privileged user
+HEALTHCHECK --interval=15s --timeout=5s --retries=3 CMD [ "pg_isready" ]
+USER postgres