diff --git a/site-modules/profile/manifests/puppetserver.pp b/site-modules/profile/manifests/puppetserver.pp
index f7d1dc5..378e0d9 100644
--- a/site-modules/profile/manifests/puppetserver.pp
+++ b/site-modules/profile/manifests/puppetserver.pp
@@ -1,6 +1,7 @@
 class profile::puppetserver (
-  Boolean $puppetserver = true,
-  Boolean $authority    = false,
+  Boolean $puppetserver      = true,
+  Boolean $authority         = false,
+  Boolean $metrics_server    = true,
 ) {
   if $puppetserver {
     class { '::profile::puppetserver::bootstrap': }
@@ -8,4 +9,9 @@ class profile::puppetserver (
   if $authority {
     class { '::profile::puppetserver::authority': }
   }
+  if $metrics_server {
+    include puppet_metrics_collector
+    include puppet_metrics_collector::system
+    include puppet_metrics_dashboard::profile::master::postgres_access
+  }
 }