diff --git a/puppet/zulip_ops/files/nagios4/conf.d/hostgroups.cfg b/puppet/zulip_ops/files/nagios4/conf.d/hostgroups.cfg
index 430fb5a3c2..4db0ef5c76 100644
--- a/puppet/zulip_ops/files/nagios4/conf.d/hostgroups.cfg
+++ b/puppet/zulip_ops/files/nagios4/conf.d/hostgroups.cfg
@@ -35,16 +35,6 @@ define hostgroup {
         alias           Production frontend web servers
         }
 
-define hostgroup {
-        hostgroup_name  multitornado_frontends
-        alias           Frontend web servers with multiple Tornado processes
-        }
-
-define hostgroup {
-        hostgroup_name  singletornado_frontends
-        alias           Frontend web servers with a single Tornado process
-        }
-
 define hostgroup {
         hostgroup_name    redis
         alias             Redis servers
diff --git a/puppet/zulip_ops/files/nagios4/conf.d/services.cfg b/puppet/zulip_ops/files/nagios4/conf.d/services.cfg
index 6c6d7ad7d1..52f67b3eb8 100644
--- a/puppet/zulip_ops/files/nagios4/conf.d/services.cfg
+++ b/puppet/zulip_ops/files/nagios4/conf.d/services.cfg
@@ -312,7 +312,7 @@ define service {
         # Workaround weird checks 40s after first error causing alerts
         # from a single failure because cron hasn't run again yet
         max_check_attempts              3
-        hostgroup_name                  singletornado_frontends
+        hostgroup_name                  frontends
         contact_groups                  page_admins
 }
 
diff --git a/puppet/zulip_ops/templates/nagios4/hosts.cfg.template.erb b/puppet/zulip_ops/templates/nagios4/hosts.cfg.template.erb
index a35bd4d7eb..9abedefbc4 100644
--- a/puppet/zulip_ops/templates/nagios4/hosts.cfg.template.erb
+++ b/puppet/zulip_ops/templates/nagios4/hosts.cfg.template.erb
@@ -4,7 +4,7 @@ define host{
        host_name        <%= host %>
        alias            <%= host %>
        address          <%= host %>.<%= @default_host_domain %>
-       hostgroups       all,web,frontends,prod_frontends,singletornado_frontends,pageable_servers
+       hostgroups       all,web,frontends,prod_frontends,pageable_servers
        }
 <% end -%>
 
@@ -14,7 +14,7 @@ define host{
        host_name        <%= host %>
        alias            <%= host %>
        address          <%= host %>
-       hostgroups       all,web,frontends,staging_frontends,singletornado_frontends,not_pageable_servers,postgresql,postgresql_primary
+       hostgroups       all,web,frontends,staging_frontends,not_pageable_servers,postgresql,postgresql_primary
        }
 <% end -%>
 
@@ -24,7 +24,7 @@ define host{
        host_name        <%= host %>
        alias            <%= host %>
        address          <%= host %>.<%= @default_host_domain %>
-       hostgroups       all,web,frontends,staging_frontends,singletornado_frontends,not_pageable_servers
+       hostgroups       all,web,frontends,staging_frontends,not_pageable_servers
        }
 <% end -%>