diff --git a/puppet/zulip_ops/files/nagios4/conf.d/services.cfg b/puppet/zulip_ops/files/nagios4/conf.d/services.cfg
index c3ff49fe83..2f4687f557 100644
--- a/puppet/zulip_ops/files/nagios4/conf.d/services.cfg
+++ b/puppet/zulip_ops/files/nagios4/conf.d/services.cfg
@@ -105,13 +105,13 @@ define service {
         use                             generic-service
         service_description             user zephyr mirror liveness
         check_command                   check_user_zephyr_mirror_liveness!22
-        hostgroup                       prod_frontends
+        hostgroup_name                  prod_frontends
         contact_groups                  admins
 }
 
 define service {
         use                             generic-service
-        hostgroup                       zmirrorp
+        hostgroup_name                  zmirrorp
         service_description             Check personal zephyr mirrors
         check_command                   check_personal_zephyr_mirrors!22
         contact_groups                  admins
@@ -167,7 +167,7 @@ define service {
         use                             generic-service
         service_description             Check PostgreSQL autovac_freeze
         check_command                   check_postgres_alert_args!zulip!nagios!autovac_freeze!101%!105%
-        hostgroup                       postgresql_primary
+        hostgroup_name                  postgresql_primary
         contact_groups                  admins
 }
 
@@ -175,7 +175,7 @@ define service {
         use                             generic-service
         service_description             Check PostgreSQL backends
         check_command                   check_postgres!zulip!nagios!backends
-        hostgroup                       postgresql
+        hostgroup_name                  postgresql
         contact_groups                  admins
 }
 
@@ -183,7 +183,7 @@ define service {
         use                             generic-service
         service_description             Check PostgreSQL connection
         check_command                   check_postgres!zulip!nagios!connection
-        hostgroup                       postgresql
+        hostgroup_name                  postgresql
         contact_groups                  page_admins
 }
 
@@ -191,7 +191,7 @@ define service {
         use                             generic-service
         service_description             Check PostgreSQL disabled triggers
         check_command                   check_postgres!zulip!nagios!disabled_triggers
-        hostgroup                       postgresql
+        hostgroup_name                  postgresql
         contact_groups                  admins
 }
 
@@ -199,7 +199,7 @@ define service {
         use                             generic-service
         service_description             Check PostgreSQL hitratio
         check_command                   check_postgres!zulip!nagios!hitratio
-        hostgroup                       postgresql
+        hostgroup_name                  postgresql
         contact_groups                  admins
 }
 
@@ -207,7 +207,7 @@ define service {
         use                             generic-service
         service_description             Check PostgreSQL locks
         check_command                   check_postgres_alert_args!zulip!nagios!locks!400!600
-        hostgroup                       postgresql
+        hostgroup_name                  postgresql
         contact_groups                  admins
 }
 
@@ -215,7 +215,7 @@ define service {
         use                             generic-service
         service_description             Check PostgreSQL query_time
         check_command                   check_postgres_alert_args!zulip!nagios!query_time!20 seconds!40 seconds
-        hostgroup                       postgresql
+        hostgroup_name                  postgresql
         contact_groups                  admins
 }
 
@@ -223,7 +223,7 @@ define service {
         use                             generic-service
         service_description             Check PostgreSQL sequence
         check_command                   check_postgres!zulip!nagios!sequence
-        hostgroup                       postgresql
+        hostgroup_name                  postgresql
         contact_groups                  admins
 }
 
@@ -231,7 +231,7 @@ define service {
         use                             generic-service
         service_description             Check PostgreSQL timesync
         check_command                   check_postgres!zulip!nagios!timesync
-        hostgroup                       postgresql
+        hostgroup_name                  postgresql
         contact_groups                  admins
 }
 
@@ -239,7 +239,7 @@ define service {
 #         use                             generic-service
 #         service_description             Check PostgreSQL txn_idle
 #         check_command                   check_postgres_alert_args!zulip!nagios!txn_idle!20 seconds!40 seconds
-#         hostgroup                       postgresql
+#         hostgroup_name                  postgresql
 #         contact_groups                  admins
 # }
 
@@ -247,7 +247,7 @@ define service {
         use                             generic-service
         service_description             Check PostgreSQL txn_time
         check_command                   check_postgres_alert_args!zulip!nagios!txn_time!20 seconds!40 seconds
-        hostgroup                       postgresql
+        hostgroup_name                  postgresql
         contact_groups                  admins
 }
 
@@ -255,7 +255,7 @@ define service {
         use                             generic-service
         service_description             Check FTS update log length
         check_command                   check_fts_update_log
-        hostgroup                       postgresql
+        hostgroup_name                  postgresql
         contact_groups                  admins
 }
 
@@ -263,7 +263,7 @@ define service{
         use                             generic-service
         service_description             Check PostgreSQL replication lag
         check_command                   check_postgresql_replication_lag
-        hostgroup                       postgresql
+        hostgroup_name                  postgresql
         contact_groups                  admins
 }
 
@@ -271,7 +271,7 @@ define service {
         use                             generic-service
         service_description             Check last PostgreSQL backup time
         check_command                   check_postgresql_backup
-        hostgroup                       postgresql
+        hostgroup_name                  postgresql
         contact_groups                  admins
 }
 
@@ -279,7 +279,7 @@ define service {
         use                             generic-service
         service_description             zmirror subscriptions syncing
         check_command                   check_sync_public_streams!22
-        hostgroup                       zmirror_main
+        hostgroup_name                  zmirror_main
         normal_check_interval           2
         retry_check_interval            2
         max_check_attempts              5
@@ -291,7 +291,7 @@ define service {
         service_description             Check redis service
         check_command                   check_redis_ssh!22
         max_check_attempts              3
-        hostgroups                      frontends, redis
+        hostgroup_name                  frontends, redis
         contact_groups                  page_admins
 }