diff --git a/site-modules/profile/manifests/kibana.pp b/site-modules/profile/manifests/kibana.pp
index 7d6503e2..4568f371 100644
--- a/site-modules/profile/manifests/kibana.pp
+++ b/site-modules/profile/manifests/kibana.pp
@@ -1,36 +1,21 @@
 class profile::kibana {
+  include ::profile::elastic::apt_config
 
-  package { 'openjdk-8-jre-headless':
-    ensure => 'present',
-  }
-
-  $keyid =  lookup('elastic::apt_config::keyid')
-  $key =    lookup('elastic::apt_config::key')
   $version = lookup('elastic::elk_version')
 
-  apt::source { 'elastic-6.x':
-    location => 'https://artifacts.elastic.co/packages/6.x/apt',
-    release  => 'stable',
-    repos    => 'main',
-    key      => {
-      id      => $keyid,
-      content => $key,
-    },
-  }
-
   package { 'kibana':
     ensure => $version,
   }
 
   apt::pin { 'kibana':
     packages => 'kibana',
     version => $version,
     priority => 1001,
   }
 
   file { '/etc/kibana/kibana.yml':
     ensure => 'file',
     content => template('profile/kibana/kibana.yml.erb'),
   }
 
 }
diff --git a/site-modules/profile/manifests/logstash.pp b/site-modules/profile/manifests/logstash.pp
index 22e58901..05f1fa0a 100644
--- a/site-modules/profile/manifests/logstash.pp
+++ b/site-modules/profile/manifests/logstash.pp
@@ -1,51 +1,36 @@
 class profile::logstash {
+  include ::profile::elastic::apt_config
 
-  package { 'openjdk-8-jre-headless':
-    ensure => 'present',
-  }
-
-  $keyid =   lookup('elastic::apt_config::keyid')
-  $key =     lookup('elastic::apt_config::key')
   $version = sprintf("1:%s-1", lookup('elastic::elk_version'))
 
-  apt::source { 'elastic-6.x':
-    location => 'https://artifacts.elastic.co/packages/6.x/apt',
-    release  => 'stable',
-    repos    => 'main',
-    key      => {
-      id      => $keyid,
-      content => $key,
-    },
-  }
-
   package { 'logstash':
     ensure => $version,
   }
 
   apt::pin { 'logstash':
     packages => 'logstash',
     version  => $version,
     priority => 1001,
   }
 
   file { '/etc/logstash/conf.d/input.conf':
     ensure => 'file',
     content => template('profile/logstash/input.conf.erb'),
   }
 
   file { '/etc/logstash/conf.d/output.conf':
     ensure => 'file',
     content => template('profile/logstash/output.conf.erb'),
   }
 
   file { '/etc/logstash/conf.d/filter.conf':
     ensure => 'file',
     content => template('profile/logstash/filter.conf.erb'),
   }
 
   service { 'logstash':
     ensure => running,
     enable => true,
   }
 
 }