diff --git a/Puppetfile b/Puppetfile
index caeb579..ad00320 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -46,6 +46,7 @@ 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'
+mod 'puppetlabs-docker', '3.9.1'
 
 # Modules from Git
 # Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples
diff --git a/data/nodes/puppet.home.yaml b/data/nodes/puppet.home.yaml
index dabcf48..241d251 100644
--- a/data/nodes/puppet.home.yaml
+++ b/data/nodes/puppet.home.yaml
@@ -1,3 +1,3 @@
 ---
 profile::puppetserver::authority: true
-profile::puppetserver::authority::validity: 7200
+profile::puppetserver::authority::validity: '7200'
diff --git a/manifests/site.pp b/manifests/site.pp
index 18ef9ca..22d49b1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -36,6 +36,19 @@ node 'puppet' {
 
 }
 
+node 'peadm-03.pe' {
+
+    include profile::tools::docker_install
+    include profile::tools::nfs_mount
+
+}
+
+node 'agent-02' {
+
+    include profile::tools::nfs_mount
+
+}
+
 node 'peadm-04.pe' {
     
     include profile::metrics_dashboard
diff --git a/site-modules/profile/manifests/metrics_dashboard.pp b/site-modules/profile/manifests/metrics_dashboard.pp
index ca03aab..973576b 100644
--- a/site-modules/profile/manifests/metrics_dashboard.pp
+++ b/site-modules/profile/manifests/metrics_dashboard.pp
@@ -7,13 +7,19 @@ Optional[Array] $puppetdb_list      = ['peadm-01.pe'],
 Optional[Array] $postgres_host_list = ['peadm-01.pe'],
 
 ) {
-
   class { 'puppet_metrics_dashboard':
     add_dashboard_examples => $dashboard_examples,
     overwrite_dashboards   => $overwrite_dashboards,
     master_list            => $master_list,
     puppetdb_list          => $puppetdb_list,
     postgres_host_list     => $postgres_host_list,
-
   }
+
+  class { 'docker':
+    version => 'latest',
+  }
+
+  class {'docker::compose':
+    version => 'latest',
+  }  
 }
diff --git a/site-modules/profile/manifests/puppetserver.pp b/site-modules/profile/manifests/puppetserver.pp
index 480aed4..0cb6d8a 100644
--- a/site-modules/profile/manifests/puppetserver.pp
+++ b/site-modules/profile/manifests/puppetserver.pp
@@ -1,7 +1,6 @@
 class profile::puppetserver (
   Boolean $puppetserver      = true,
   Boolean $authority         = false,
-  Boolean $metrics_server    = false,
   Boolean $nfs_export        = true,
 ) {
   if $puppetserver {
@@ -10,11 +9,6 @@ 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
-  }
   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 4fc4401..2e738a9 100644
--- a/site-modules/profile/manifests/puppetserver/bootstrap.pp
+++ b/site-modules/profile/manifests/puppetserver/bootstrap.pp
@@ -32,12 +32,12 @@ class profile::puppetserver::bootstrap {
     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']]],
-    }
+#  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/tools/docker_install.pp b/site-modules/profile/manifests/tools/docker_install.pp
new file mode 100644
index 0000000..44a1ec3
--- /dev/null
+++ b/site-modules/profile/manifests/tools/docker_install.pp
@@ -0,0 +1,15 @@
+class profile::tools::docker_install (
+  $docker_version  = '19.03',
+  $compose_version = '1.24',
+) {
+  class { 'docker':
+    ensure  => present,
+    version => '$docker_version',
+  }
+
+ class {'docker::compose':
+  ensure  => present,
+  version => '$compose_version',
+  }
+
+}
diff --git a/site-modules/profile/manifests/tools/nfs_mount.pp b/site-modules/profile/manifests/tools/nfs_mount.pp
index d7a7172..a392771 100644
--- a/site-modules/profile/manifests/tools/nfs_mount.pp
+++ b/site-modules/profile/manifests/tools/nfs_mount.pp
@@ -1,5 +1,5 @@
 class profile::tools::nfs_mount (
-  $server = 'peadm-01.pe',
+  $server = 'puppet',
 ) {
   class { '::nfs':
       server_enabled => false,