diff --git a/Puppetfile b/Puppetfile
index eecd7f2..caeb579 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -42,6 +42,10 @@ mod 'puppetlabs-apt', '7.4.1'
 mod 'puppetlabs-translate', '2.2.0'
 mod 'puppet-grafana', '6.1.0'
 mod 'puppet-telegraf', '3.0.0'
+mod 'derdanne-nfs', '2.1.2'
+mod 'herculesteam-augeasproviders_core', '2.6.0'
+mod 'herculesteam-augeasproviders_shellvar', '4.0.0'
+mod 'puppetlabs-transition', '0.1.3'
 
 # Modules from Git
 # Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples
diff --git a/site-modules/profile/manifests/puppetserver.pp b/site-modules/profile/manifests/puppetserver.pp
index 378e0d9..480aed4 100644
--- a/site-modules/profile/manifests/puppetserver.pp
+++ b/site-modules/profile/manifests/puppetserver.pp
@@ -1,7 +1,8 @@
 class profile::puppetserver (
   Boolean $puppetserver      = true,
   Boolean $authority         = false,
-  Boolean $metrics_server    = true,
+  Boolean $metrics_server    = false,
+  Boolean $nfs_export        = true,
 ) {
   if $puppetserver {
     class { '::profile::puppetserver::bootstrap': }
@@ -14,4 +15,7 @@ class profile::puppetserver (
     include puppet_metrics_collector::system
     include puppet_metrics_dashboard::profile::master::postgres_access
   }
+  if $nfs_export {
+    class { '::profile::puppetserver::nfs_export': }
+  }
 }
diff --git a/site-modules/profile/manifests/puppetserver/bootstrap.pp b/site-modules/profile/manifests/puppetserver/bootstrap.pp
index 033650a..4fc4401 100644
--- a/site-modules/profile/manifests/puppetserver/bootstrap.pp
+++ b/site-modules/profile/manifests/puppetserver/bootstrap.pp
@@ -31,4 +31,13 @@ class profile::puppetserver::bootstrap {
     group  => 'pe-puppet',
     mode   => '0750',
   }
+
+  pe_node_group { 'puppetmaster-dashboard':
+      ensure               => 'present',
+      classes              => {'puppet_metrics_dashboard::profile::master::postgres_access' => { }},
+      description          => 'Puppetmaster Dashboard workaround group',
+      environment          => 'production',
+      parent               => 'All Nodes',
+      rule                 => ['or', ['=', 'name', $facts['puppet_master_server']]],
+    }
 }
diff --git a/site-modules/profile/manifests/puppetserver/nfs_export.pp b/site-modules/profile/manifests/puppetserver/nfs_export.pp
new file mode 100644
index 0000000..59f9ab2
--- /dev/null
+++ b/site-modules/profile/manifests/puppetserver/nfs_export.pp
@@ -0,0 +1,16 @@
+class profile::puppetserver::nfs_export (
+
+) {
+    class { '::nfs':
+      server_enabled => true,
+      nfs_v4 => true,
+      nfs_v4_idmap_domain => 'peadm.01.pe',
+      nfs_v4_export_root  => '/export',
+      nfs_v4_export_root_clients => '*(rw,fsid=0,insecure,no_subtree_check,async,no_root_squash)',
+    }
+
+    nfs::server::export { '/opt/puppetlabs/puppet-metrics-collector':
+      ensure  => 'mounted',
+      clients => '*(rw,insecure,async,no_root_squash,no_subtree_check)',
+    }
+}