diff --git a/puppet/zulip_ops/manifests/profile/chat_zulip_org.pp b/puppet/zulip_ops/manifests/profile/chat_zulip_org.pp
index 1ab59f260e..fb6db66daf 100644
--- a/puppet/zulip_ops/manifests/profile/chat_zulip_org.pp
+++ b/puppet/zulip_ops/manifests/profile/chat_zulip_org.pp
@@ -1,9 +1,8 @@
-class zulip_ops::profile::chat_zulip_org {
+class zulip_ops::profile::chat_zulip_org inherits zulip_ops::profile::base {
   include zulip::profile::standalone
   include zulip::postfix_localmail
   include zulip::hooks::sentry
 
-  include zulip_ops::profile::base
   include zulip_ops::app_frontend_monitoring
   include zulip_ops::prometheus::redis
   include zulip_ops::prometheus::postgresql
diff --git a/puppet/zulip_ops/manifests/profile/grafana.pp b/puppet/zulip_ops/manifests/profile/grafana.pp
index abe8e6e3f3..9f1d2f0c65 100644
--- a/puppet/zulip_ops/manifests/profile/grafana.pp
+++ b/puppet/zulip_ops/manifests/profile/grafana.pp
@@ -1,7 +1,7 @@
 # @summary Observability using Grafana
 #
-class zulip_ops::profile::grafana {
-  include zulip_ops::profile::base
+class zulip_ops::profile::grafana inherits zulip_ops::profile::base {
+
   include zulip::supervisor
 
   $version = $zulip::common::versions['grafana']['version']
diff --git a/puppet/zulip_ops/manifests/profile/munin_server.pp b/puppet/zulip_ops/manifests/profile/munin_server.pp
index 30f150de1a..f7eb7891db 100644
--- a/puppet/zulip_ops/manifests/profile/munin_server.pp
+++ b/puppet/zulip_ops/manifests/profile/munin_server.pp
@@ -1,5 +1,5 @@
-class zulip_ops::profile::munin_server {
-  include zulip_ops::profile::base
+class zulip_ops::profile::munin_server inherits zulip_ops::profile::base {
+
   include zulip_ops::apache
   include zulip::supervisor
 
diff --git a/puppet/zulip_ops/manifests/profile/nagios.pp b/puppet/zulip_ops/manifests/profile/nagios.pp
index 336a9ff182..9e853de5c6 100644
--- a/puppet/zulip_ops/manifests/profile/nagios.pp
+++ b/puppet/zulip_ops/manifests/profile/nagios.pp
@@ -1,5 +1,5 @@
-class zulip_ops::profile::nagios {
-  include zulip_ops::profile::base
+class zulip_ops::profile::nagios inherits zulip_ops::profile::base {
+
   include zulip_ops::apache
 
   zulip::ssh_keys { 'nagios': }
diff --git a/puppet/zulip_ops/manifests/profile/postgresql.pp b/puppet/zulip_ops/manifests/profile/postgresql.pp
index 0c1f09708f..de092a4f87 100644
--- a/puppet/zulip_ops/manifests/profile/postgresql.pp
+++ b/puppet/zulip_ops/manifests/profile/postgresql.pp
@@ -1,5 +1,5 @@
-class zulip_ops::profile::postgresql {
-  include zulip_ops::profile::base
+class zulip_ops::profile::postgresql inherits zulip_ops::profile::base {
+
   include zulip::profile::postgresql
   include zulip_ops::teleport::db
   include zulip_ops::prometheus::postgresql
diff --git a/puppet/zulip_ops/manifests/profile/prod_app_frontend.pp b/puppet/zulip_ops/manifests/profile/prod_app_frontend.pp
index e148618dda..e18c8caf78 100644
--- a/puppet/zulip_ops/manifests/profile/prod_app_frontend.pp
+++ b/puppet/zulip_ops/manifests/profile/prod_app_frontend.pp
@@ -1,5 +1,4 @@
-class zulip_ops::profile::prod_app_frontend {
-  include zulip_ops::profile::base
+class zulip_ops::profile::prod_app_frontend inherits zulip_ops::profile::base {
   include zulip_ops::app_frontend
   include zulip::hooks::zulip_notify
 
diff --git a/puppet/zulip_ops/manifests/profile/prometheus_server.pp b/puppet/zulip_ops/manifests/profile/prometheus_server.pp
index d6d8a9bda5..faf8175e23 100644
--- a/puppet/zulip_ops/manifests/profile/prometheus_server.pp
+++ b/puppet/zulip_ops/manifests/profile/prometheus_server.pp
@@ -2,8 +2,8 @@
 #
 # Only one instance is necessary.
 #
-class zulip_ops::profile::prometheus_server {
-  include zulip_ops::profile::base
+class zulip_ops::profile::prometheus_server inherits zulip_ops::profile::base {
+
   include zulip_ops::prometheus::base
 
   # This blackbox monitoring of the backup system runs locally
diff --git a/puppet/zulip_ops/manifests/profile/smokescreen.pp b/puppet/zulip_ops/manifests/profile/smokescreen.pp
index cd8291682b..0dbafd53d9 100644
--- a/puppet/zulip_ops/manifests/profile/smokescreen.pp
+++ b/puppet/zulip_ops/manifests/profile/smokescreen.pp
@@ -1,5 +1,5 @@
-class zulip_ops::profile::smokescreen {
-  include zulip_ops::profile::base
+class zulip_ops::profile::smokescreen inherits zulip_ops::profile::base {
+
 
   include zulip::profile::smokescreen
   zulip_ops::firewall_allow { 'smokescreen': port => '4750' }
diff --git a/puppet/zulip_ops/manifests/profile/staging_app_frontend.pp b/puppet/zulip_ops/manifests/profile/staging_app_frontend.pp
index 0551daa264..b53ef7ae6d 100644
--- a/puppet/zulip_ops/manifests/profile/staging_app_frontend.pp
+++ b/puppet/zulip_ops/manifests/profile/staging_app_frontend.pp
@@ -1,5 +1,5 @@
-class zulip_ops::profile::staging_app_frontend {
-  include zulip_ops::profile::base
+class zulip_ops::profile::staging_app_frontend inherits zulip_ops::profile::base {
+
   include zulip_ops::app_frontend
 
   file { '/etc/nginx/sites-available/zulip-staging':
diff --git a/puppet/zulip_ops/manifests/profile/teleport.pp b/puppet/zulip_ops/manifests/profile/teleport.pp
index 1f6d8e454a..60b3901147 100644
--- a/puppet/zulip_ops/manifests/profile/teleport.pp
+++ b/puppet/zulip_ops/manifests/profile/teleport.pp
@@ -1,5 +1,5 @@
-class zulip_ops::profile::teleport {
-  include zulip_ops::profile::base
+class zulip_ops::profile::teleport inherits zulip_ops::profile::base {
+
 
   file { '/etc/teleport_server.yaml':
     owner  => 'root',
diff --git a/puppet/zulip_ops/manifests/profile/zmirror.pp b/puppet/zulip_ops/manifests/profile/zmirror.pp
index f2798087ee..0309d16e35 100644
--- a/puppet/zulip_ops/manifests/profile/zmirror.pp
+++ b/puppet/zulip_ops/manifests/profile/zmirror.pp
@@ -1,5 +1,5 @@
-class zulip_ops::profile::zmirror {
-  include zulip_ops::profile::base
+class zulip_ops::profile::zmirror inherits zulip_ops::profile::base {
+
   include zulip::supervisor
 
   $zmirror_packages = [# Packages needed to run the mirror
diff --git a/puppet/zulip_ops/manifests/profile/zmirror_personals.pp b/puppet/zulip_ops/manifests/profile/zmirror_personals.pp
index d65c8582ce..eb94d0b630 100644
--- a/puppet/zulip_ops/manifests/profile/zmirror_personals.pp
+++ b/puppet/zulip_ops/manifests/profile/zmirror_personals.pp
@@ -1,5 +1,5 @@
-class zulip_ops::profile::zmirror_personals {
-  include zulip_ops::profile::base
+class zulip_ops::profile::zmirror_personals inherits zulip_ops::profile::base {
+
   include zulip::supervisor
 
   $zmirror_packages = [# Packages needed to run the mirror
diff --git a/puppet/zulip_ops/manifests/profile/zulipbot_zulip_org.pp b/puppet/zulip_ops/manifests/profile/zulipbot_zulip_org.pp
index 7c7dd68b3d..66eb48beb0 100644
--- a/puppet/zulip_ops/manifests/profile/zulipbot_zulip_org.pp
+++ b/puppet/zulip_ops/manifests/profile/zulipbot_zulip_org.pp
@@ -1,5 +1,5 @@
-class zulip_ops::profile::zulipbot_zulip_org {
-  include zulip_ops::profile::base
+class zulip_ops::profile::zulipbot_zulip_org inherits zulip_ops::profile::base {
+
   zulip_ops::firewall_allow { 'http': }
   zulip_ops::firewall_allow { 'https': }