diff --git a/puppet/zulip_ops/files/nagios4/conf.d/hostgroups.cfg b/puppet/zulip_ops/files/nagios4/conf.d/hostgroups.cfg
index 625793ce31..bea3731813 100644
--- a/puppet/zulip_ops/files/nagios4/conf.d/hostgroups.cfg
+++ b/puppet/zulip_ops/files/nagios4/conf.d/hostgroups.cfg
@@ -29,6 +29,11 @@ define hostgroup {
         alias                   Servers for whom we do not page, and have flakier net
 }
 
+define hostgroup {
+        hostgroup_name          fullstack
+        alias                   Fullstack hosts
+}
+
 define hostgroup {
         hostgroup_name          frontends
         alias                   Frontend web servers
diff --git a/puppet/zulip_ops/templates/nagios4/hosts.cfg.template.erb b/puppet/zulip_ops/templates/nagios4/hosts.cfg.template.erb
index 1e5f3a1e1b..54c37f80da 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 %>
-       hostgroups       all,non_aws_host,frontends,not_pageable_servers,postgresql_primary
+       hostgroups       all,fullstack,non_aws_host,frontends,not_pageable_servers,postgresql_primary
        }
 <% end -%>