diff --git a/roles/postgres/templates/svc-postgres.json.j2 b/roles/postgres/templates/svc-postgres.json.j2
index e3772b0c9..90a7d7ed4 100644
--- a/roles/postgres/templates/svc-postgres.json.j2
+++ b/roles/postgres/templates/svc-postgres.json.j2
@@ -16,7 +16,7 @@
       "version": "{{ pg_version }}"
     },
     "check": {
-      "tcp": "127.0.0.1:{{ pg_port }}",
+      "args": ["{{ pg_bin_dir }}/pg_isready", "-p", "{{ pg_port }}", "-U", "{{ pg_monitor_username|default('dbuser_monitor') }}"],
       "interval": "15s",
       "timeout": "1s"
     }
diff --git a/roles/service/templates/svc-cluster-role.json.j2 b/roles/service/templates/svc-cluster-role.json.j2
index 288e8d2df..2e3c43bc7 100644
--- a/roles/service/templates/svc-cluster-role.json.j2
+++ b/roles/service/templates/svc-cluster-role.json.j2
@@ -14,11 +14,6 @@
       "service": "{{ pg_cluster }}-{{ service.name }}",
       "cluster": "{{ pg_cluster }}",
       "version": "{{ pg_version }}"
-    },
-    "check": {
-      "tcp": "127.0.0.1:{{ service.src_port }}",
-      "interval": "15s",
-      "timeout": "1s"
     }
   }
 }
\ No newline at end of file