diff --git a/puppet/zulip_internal/files/nagios3/conf.d/hostgroups.cfg b/puppet/zulip_internal/files/nagios3/conf.d/hostgroups.cfg
index 4b7f75b874..b6cab55cc0 100644
--- a/puppet/zulip_internal/files/nagios3/conf.d/hostgroups.cfg
+++ b/puppet/zulip_internal/files/nagios3/conf.d/hostgroups.cfg
@@ -33,4 +33,9 @@ define hostgroup {
 define hostgroup {
        hostgroup_name  postgres
        alias           PostgreSQL Servers
-       }
\ No newline at end of file
+       }
+
+define hostgroup {
+       hostgroup_name  postgres_primary
+       alias           PostgreSQL Servers
+       }
diff --git a/puppet/zulip_internal/files/nagios3/conf.d/hosts.cfg b/puppet/zulip_internal/files/nagios3/conf.d/hosts.cfg
index e38c46bcab..9cb037d773 100644
--- a/puppet/zulip_internal/files/nagios3/conf.d/hosts.cfg
+++ b/puppet/zulip_internal/files/nagios3/conf.d/hosts.cfg
@@ -75,7 +75,7 @@ define host{
        host_name        postgres2
        alias            postgres2
        address          postgres2.zulip.net
-       hostgroups       all,postgres,pageable_servers
+       hostgroups       all,postgres,postgres_primary,pageable_servers
        }
 
 define host{
diff --git a/puppet/zulip_internal/files/nagios3/conf.d/services.cfg b/puppet/zulip_internal/files/nagios3/conf.d/services.cfg
index 37db9ebfd1..8a67669707 100644
--- a/puppet/zulip_internal/files/nagios3/conf.d/services.cfg
+++ b/puppet/zulip_internal/files/nagios3/conf.d/services.cfg
@@ -113,7 +113,7 @@ define service {
         use                             generic-service
         service_description             Check postgres autovac_freeze
         check_command                   check_postgres!22!autovac_freeze
-        host                            postgres2
+        hostgroup                       postgres_primary
         contact_groups                  admins
 }