diff --git a/attributes/default.rb b/attributes/default.rb
index b1b48d7..d249a88 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -24,7 +24,6 @@
 )
 
 ### Java Attributes ###
-default['java']['install_flavor'] = 'openjdk'
 default['java']['jdk_version'] = '8'
 
 ### Prerequisites ###
diff --git a/recipes/default.rb b/recipes/default.rb
index 810d5f7..a5b9fb3 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -8,7 +8,7 @@
 include_recipe 'mapr::repositories'
 
 # Install java
-include_recipe 'java::default'
+openjdk_install node['java']['jdk_version']
 
 include_recipe 'mapr::users'
 
diff --git a/spec/unit/recipes/cldb_spec.rb b/spec/unit/recipes/cldb_spec.rb
index ff9c0b2..a685e76 100644
--- a/spec/unit/recipes/cldb_spec.rb
+++ b/spec/unit/recipes/cldb_spec.rb
@@ -6,11 +6,11 @@
 require 'spec_helper'
 
 describe 'mapr::cldb' do
-  context 'When all attributes are default, on centos 7.4.1708' do
+  context 'When all attributes are default, on centos 7.6.1810' do
     let(:chef_run) do
       ChefSpec::SoloRunner.new(
         platform: 'centos',
-        version:  '7.4.1708',
+        version:  '7.6.1810',
       ).converge(described_recipe)
     end
 
@@ -55,7 +55,7 @@
 
   context 'Secure mode (Not necessarily with Kerberos)' do
     let(:chef_run) do
-      ChefSpec::SoloRunner.new platform: 'centos', version: '7.4.1708' do |node|
+      ChefSpec::SoloRunner.new platform: 'centos', version: '7.6.1810' do |node|
         node.override['mapr']['cluster']['config']['security']['secure'] = true
       end.converge(described_recipe)
     end
diff --git a/spec/unit/recipes/collectd_spec.rb b/spec/unit/recipes/collectd_spec.rb
index 6f29fad..b3c8ad4 100644
--- a/spec/unit/recipes/collectd_spec.rb
+++ b/spec/unit/recipes/collectd_spec.rb
@@ -6,11 +6,11 @@
 require 'spec_helper'
 
 describe 'mapr::collectd' do
-  context 'When all attributes are default, on centos 7.4.1708' do
+  context 'When all attributes are default, on centos 7.6.1810' do
     let(:chef_run) do
       runner = ChefSpec::SoloRunner.new(
         platform: 'centos',
-        version:  '7.4.1708',
+        version:  '7.6.1810',
       )
       runner.converge(described_recipe)
     end
diff --git a/spec/unit/recipes/compute_spec.rb b/spec/unit/recipes/compute_spec.rb
index 6653dd0..27c9b83 100644
--- a/spec/unit/recipes/compute_spec.rb
+++ b/spec/unit/recipes/compute_spec.rb
@@ -6,11 +6,11 @@
 require 'spec_helper'
 
 describe 'mapr::compute' do
-  context 'When all attributes are default, on centos 7.4.1708' do
+  context 'When all attributes are default, on centos 7.6.1810' do
     let(:chef_run) do
       runner = ChefSpec::SoloRunner.new(
         platform: 'centos',
-        version:  '7.4.1708',
+        version:  '7.6.1810',
       )
       runner.converge(described_recipe)
     end
diff --git a/spec/unit/recipes/config_spec.rb b/spec/unit/recipes/config_spec.rb
index af95586..5b6be29 100644
--- a/spec/unit/recipes/config_spec.rb
+++ b/spec/unit/recipes/config_spec.rb
@@ -12,7 +12,7 @@
     let(:chef_run) do
       ChefSpec::SoloRunner.new(
         platform:  'centos',
-        version:   '7.4.1708',
+        version:   '7.6.1810',
         step_into: %w[mapr_configure_sh],
       ).converge(described_recipe)
     end
@@ -42,7 +42,7 @@
     let(:chef_run) do
       ChefSpec::SoloRunner.new(
         platform: 'centos',
-        version:  '7.4.1708',
+        version:  '7.6.1810',
       ) do |node|
         node.override['mapr']['cluster']['config']['security']['secure'] = true
       end.converge(described_recipe)
diff --git a/spec/unit/recipes/core_spec.rb b/spec/unit/recipes/core_spec.rb
index 42ea3eb..c843613 100644
--- a/spec/unit/recipes/core_spec.rb
+++ b/spec/unit/recipes/core_spec.rb
@@ -6,11 +6,11 @@
 require 'spec_helper'
 
 describe 'mapr::core' do
-  context 'When all attributes are default, on centos 7.4.1708' do
+  context 'When all attributes are default, on centos 7.6.1810' do
     let(:chef_run) do
       ChefSpec::SoloRunner.new(
         platform: 'centos',
-        version:  '7.4.1708',
+        version:  '7.6.1810',
       ).converge(described_recipe)
     end
 
diff --git a/spec/unit/recipes/default_spec.rb b/spec/unit/recipes/default_spec.rb
index a5dfb61..369a881 100644
--- a/spec/unit/recipes/default_spec.rb
+++ b/spec/unit/recipes/default_spec.rb
@@ -8,16 +8,16 @@
 require 'spec_helper'
 
 describe 'mapr::default' do
-  context 'When all attributes are default, on centos 7.4.1708' do
+  context 'When all attributes are default, on centos 7.6.1810' do
     let(:chef_run) do
       ChefSpec::SoloRunner.new(
         platform: 'centos',
-        version:  '7.4.1708',
+        version:  '7.6.1810',
       ).converge(described_recipe)
     end
 
     it 'should include fundamental recipes' do
-      %w[mapr::warden mapr::repositories mapr::core java::default].each do |recipe|
+      %w[mapr::warden mapr::repositories mapr::core].each do |recipe|
         expect(chef_run).to include_recipe(recipe)
       end
     end
diff --git a/spec/unit/recipes/disks_spec.rb b/spec/unit/recipes/disks_spec.rb
index 0547c58..5cf4c17 100644
--- a/spec/unit/recipes/disks_spec.rb
+++ b/spec/unit/recipes/disks_spec.rb
@@ -6,14 +6,14 @@
 require 'spec_helper'
 
 describe 'mapr::disks' do
-  context 'When all attributes are default, on centos 7.4.1708' do
+  context 'When all attributes are default, on centos 7.6.1810' do
     let(:disk0) { '/dev/disk/by-id/wwn-0x12345678' }
     let(:disk2) { '/dev/disk/by-id/wwn-0x02346578' }
     let(:disk3) { '/dev/disk/by-id/wwn-0x00346578' }
     let(:chef_run) do
       runner = ChefSpec::SoloRunner.new(
         platform:  'centos',
-        version:   '7.4.1708',
+        version:   '7.6.1810',
         step_into: %w[mapr_disksetup],
       ) do |node|
         ['a', 'b', 'r', 'z', 'y', 't'].each do |t|
diff --git a/spec/unit/recipes/grafana_spec.rb b/spec/unit/recipes/grafana_spec.rb
index 50620f0..a12dcf0 100644
--- a/spec/unit/recipes/grafana_spec.rb
+++ b/spec/unit/recipes/grafana_spec.rb
@@ -6,11 +6,11 @@
 require 'spec_helper'
 
 describe 'mapr::grafana' do
-  context 'When all attributes are default, on centos 7.4.1708' do
+  context 'When all attributes are default, on centos 7.6.1810' do
     let(:chef_run) do
       runner = ChefSpec::SoloRunner.new(
         platform: 'centos',
-        version:  '7.4.1708',
+        version:  '7.6.1810',
       )
       runner.converge(described_recipe)
     end
diff --git a/spec/unit/recipes/hadoop_spec.rb b/spec/unit/recipes/hadoop_spec.rb
index 2862a64..7f8d5dd 100644
--- a/spec/unit/recipes/hadoop_spec.rb
+++ b/spec/unit/recipes/hadoop_spec.rb
@@ -7,9 +7,9 @@
 
 describe 'mapr::hadoop' do
   let(:hadoop_path) { '/opt/mapr/hadoop/hadoop-2.7.0/etc/hadoop' }
-  context 'When all attributes are default, on centos 7.4.1708' do
+  context 'When all attributes are default, on centos 7.6.1810' do
     let(:chef_run) do
-      ChefSpec::SoloRunner.new platform: 'centos', version: '7.4.1708' do |node|
+      ChefSpec::SoloRunner.new platform: 'centos', version: '7.6.1810' do |node|
         node.override['mapr']['hadoop']['config'] = {
           'core' => { 'property' => 'value' },
           'hdfs' => { 'property' => 'value' },
diff --git a/spec/unit/recipes/hs_spec.rb b/spec/unit/recipes/hs_spec.rb
index a8fe699..2bc320b 100644
--- a/spec/unit/recipes/hs_spec.rb
+++ b/spec/unit/recipes/hs_spec.rb
@@ -6,11 +6,11 @@
 require 'spec_helper'
 
 describe 'mapr::hs' do
-  context 'When all attributes are default, on centos 7.4.1708' do
+  context 'When all attributes are default, on centos 7.6.1810' do
     let(:chef_run) do
       ChefSpec::SoloRunner.new(
         platform: 'centos',
-        version:  '7.4.1708',
+        version:  '7.6.1810',
       ).converge(described_recipe)
     end
 
diff --git a/spec/unit/recipes/httpfs_rspec.rb b/spec/unit/recipes/httpfs_rspec.rb
index 5a46e63..52e12f8 100644
--- a/spec/unit/recipes/httpfs_rspec.rb
+++ b/spec/unit/recipes/httpfs_rspec.rb
@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 describe 'mapr::httpfs' do
-  context 'When all attributes are default, on centos 7.4.1708' do
+  context 'When all attributes are default, on centos 7.6.1810' do
     let(:chef_run) do
       ChefSpec::SoloRunner.new(
         platform:  'centos',
-        version:   '7.4.1708',
+        version:   '7.6.1810',
         step_into: ['warden_service'],
         ).converge(described_recipe)
     end
@@ -29,7 +29,7 @@
     let(:chef_run) do
       ChefSpec::SoloRunner.new(
         platform:  'centos',
-        version:   '7.4.1708',
+        version:   '7.6.1810',
         step_into: ['warden_service'],
         ) do |node|
         node.override['mapr']['httpfs']['nb_servers']  = 46
diff --git a/spec/unit/recipes/mast_gateway_spec.rb b/spec/unit/recipes/mast_gateway_spec.rb
index 6773103..8948294 100644
--- a/spec/unit/recipes/mast_gateway_spec.rb
+++ b/spec/unit/recipes/mast_gateway_spec.rb
@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 describe 'mapr::mast_gateway' do
-  context 'When all attributes are default, on centos 7.4.1708' do
+  context 'When all attributes are default, on centos 7.6.1810' do
     let(:chef_run) do
       ChefSpec::SoloRunner.new(
         platform:  'centos',
-        version:   '7.4.1708',
+        version:   '7.6.1810',
         step_into: ['warden_service'],
       ).converge(described_recipe)
     end
diff --git a/spec/unit/recipes/mcs_spec.rb b/spec/unit/recipes/mcs_spec.rb
index a095a5a..908198b 100644
--- a/spec/unit/recipes/mcs_spec.rb
+++ b/spec/unit/recipes/mcs_spec.rb
@@ -6,11 +6,11 @@
 require 'spec_helper'
 
 describe 'mapr::mcs' do
-  context 'When all attributes are default, on centos 7.4.1708' do
+  context 'When all attributes are default, on centos 7.6.1810' do
     let(:chef_run) do
       runner = ChefSpec::SoloRunner.new(
         platform: 'centos',
-        version:  '7.4.1708',
+        version:  '7.6.1810',
       )
       runner.converge(described_recipe)
     end
diff --git a/spec/unit/recipes/mfs_spec.rb b/spec/unit/recipes/mfs_spec.rb
index 115e50c..c4d9cf9 100644
--- a/spec/unit/recipes/mfs_spec.rb
+++ b/spec/unit/recipes/mfs_spec.rb
@@ -6,11 +6,11 @@
 require 'spec_helper'
 
 describe 'mapr::mfs' do
-  context 'When all attributes are default, on centos 7.4.1708' do
+  context 'When all attributes are default, on centos 7.6.1810' do
     let(:chef_run) do
       runner = ChefSpec::SoloRunner.new(
         platform: 'centos',
-        version:  '7.4.1708',
+        version:  '7.6.1810',
       )
       runner.converge(described_recipe)
     end
diff --git a/spec/unit/recipes/nfs_spec.rb b/spec/unit/recipes/nfs_spec.rb
index 9b183e9..8ce307d 100644
--- a/spec/unit/recipes/nfs_spec.rb
+++ b/spec/unit/recipes/nfs_spec.rb
@@ -6,11 +6,11 @@
 require 'spec_helper'
 
 describe 'mapr::nfs' do
-  context 'When all attributes are default, on centos 7.4.1708' do
+  context 'When all attributes are default, on centos 7.6.1810' do
     let(:chef_run) do
       runner = ChefSpec::SoloRunner.new(
         platform: 'centos',
-        version:  '7.4.1708',
+        version:  '7.6.1810',
       )
       runner.converge(described_recipe)
     end
diff --git a/spec/unit/recipes/opentsdb_spec.rb b/spec/unit/recipes/opentsdb_spec.rb
index 4c65b89..ca5d9ef 100644
--- a/spec/unit/recipes/opentsdb_spec.rb
+++ b/spec/unit/recipes/opentsdb_spec.rb
@@ -6,11 +6,11 @@
 require 'spec_helper'
 
 describe 'mapr::opentsdb' do
-  context 'When all attributes are default, on centos 7.4.1708' do
+  context 'When all attributes are default, on centos 7.6.1810' do
     let(:chef_run) do
       runner = ChefSpec::SoloRunner.new(
         platform: 'centos',
-        version:  '7.4.1708',
+        version:  '7.6.1810',
       )
       runner.converge(described_recipe)
     end
diff --git a/spec/unit/recipes/repositories_spec.rb b/spec/unit/recipes/repositories_spec.rb
index 007ebc2..fa033fb 100644
--- a/spec/unit/recipes/repositories_spec.rb
+++ b/spec/unit/recipes/repositories_spec.rb
@@ -6,11 +6,11 @@
 require 'spec_helper'
 
 describe 'mapr::repositories' do
-  context 'When all attributes are default, on centos 7.4.1708' do
+  context 'When all attributes are default, on centos 7.6.1810' do
     let(:chef_run) do
       runner = ChefSpec::SoloRunner.new(
         platform: 'centos',
-        version:  '7.4.1708',
+        version:  '7.6.1810',
       )
       runner.converge(described_recipe)
     end
diff --git a/spec/unit/recipes/resourcemanager_spec.rb b/spec/unit/recipes/resourcemanager_spec.rb
index 6cf25cf..77e9093 100644
--- a/spec/unit/recipes/resourcemanager_spec.rb
+++ b/spec/unit/recipes/resourcemanager_spec.rb
@@ -6,11 +6,11 @@
 require 'spec_helper'
 
 describe 'mapr::resourcemanager' do
-  context 'When all attributes are default, on centos 7.4.1708' do
+  context 'When all attributes are default, on centos 7.6.1810' do
     let(:chef_run) do
       runner = ChefSpec::SoloRunner.new(
         platform: 'centos',
-        version:  '7.4.1708',
+        version:  '7.6.1810',
       )
       runner.converge(described_recipe)
     end
diff --git a/spec/unit/recipes/security_spec.rb b/spec/unit/recipes/security_spec.rb
index 44de78f..87b9152 100644
--- a/spec/unit/recipes/security_spec.rb
+++ b/spec/unit/recipes/security_spec.rb
@@ -6,7 +6,7 @@
     let(:chef_run) do
       ChefSpec::SoloRunner.new(
         platform: 'centos',
-        version:  '7.4.1708',
+        version:  '7.6.1810',
       ).converge(described_recipe)
     end
     it 'should create the ssl files' do
@@ -33,7 +33,7 @@
 
   context 'Secure mode in a master node' do
     let(:chef_run) do
-      ChefSpec::SoloRunner.new platform: 'centos', version: '7.4.1708' do |node|
+      ChefSpec::SoloRunner.new platform: 'centos', version: '7.6.1810' do |node|
         node.override['mapr']['cluster']['components'] = %w[cldb]
         node.override['mapr']['cluster']['config']['security']['secure'] = true
       end.converge(described_recipe)
diff --git a/spec/unit/recipes/smart_install_spec.rb b/spec/unit/recipes/smart_install_spec.rb
index 8ba72ee..614b0bf 100644
--- a/spec/unit/recipes/smart_install_spec.rb
+++ b/spec/unit/recipes/smart_install_spec.rb
@@ -10,7 +10,7 @@
     let(:chef_run) do
       ChefSpec::SoloRunner.new(
         platform: 'centos',
-        version:  '7.4.1708',
+        version:  '7.6.1810',
       ) do |node|
         node.override['mapr']['cluster']['components'] = %w[cldb resourcemanager zookeeper]
       end.converge(described_recipe)
diff --git a/spec/unit/recipes/users_spec.rb b/spec/unit/recipes/users_spec.rb
index 0ae8c17..53d5e77 100644
--- a/spec/unit/recipes/users_spec.rb
+++ b/spec/unit/recipes/users_spec.rb
@@ -6,11 +6,11 @@
 require 'spec_helper'
 
 describe 'mapr::default' do
-  context 'With default attributes, on centos 7.4.1708' do
+  context 'With default attributes, on centos 7.6.1810' do
     let(:chef_run) do
       ChefSpec::SoloRunner.new(
         platform: 'centos',
-        version:  '7.4.1708',
+        version:  '7.6.1810',
       ).converge(described_recipe)
     end
 
diff --git a/spec/unit/recipes/warden_spec.rb b/spec/unit/recipes/warden_spec.rb
index 27bbaa1..7fdc4c8 100644
--- a/spec/unit/recipes/warden_spec.rb
+++ b/spec/unit/recipes/warden_spec.rb
@@ -10,7 +10,7 @@
     let(:chef_run) do
       runner = ChefSpec::SoloRunner.new(
         platform: 'centos',
-        version:  '7.4.1708',
+        version:  '7.6.1810',
       )
       runner.converge(described_recipe)
     end
diff --git a/spec/unit/recipes/zookeeper_spec.rb b/spec/unit/recipes/zookeeper_spec.rb
index 6fcb2b6..61ee228 100644
--- a/spec/unit/recipes/zookeeper_spec.rb
+++ b/spec/unit/recipes/zookeeper_spec.rb
@@ -11,7 +11,7 @@
     let(:chef_run) do
       runner = ChefSpec::SoloRunner.new(
         platform: 'centos',
-        version:  '7.4.1708',
+        version:  '7.6.1810',
       )
       runner.converge(described_recipe)
     end
@@ -68,7 +68,7 @@
     let(:chef_run) do
       ChefSpec::SoloRunner.new(
         platform: 'centos',
-        version:  '7.4.1708',
+        version:  '7.6.1810',
       ) do |node|
         node.override['mapr']['cluster']['config']['security']['secure'] = true
       end.converge(described_recipe)