diff --git a/.gitignore b/.gitignore
index 822ea7f..983167b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # General ignores
 Gemfile.lock
+Berksfile.lock
 tmp/
 berks-cookbooks
 .DS_Store
@@ -17,3 +18,5 @@ nohup.out
 
 # Alfresco license ignores
 **/*.lic
+
+.idea
\ No newline at end of file
diff --git a/Berksfile.lock b/Berksfile.lock
index 3507f6f..4805ab9 100644
--- a/Berksfile.lock
+++ b/Berksfile.lock
@@ -5,6 +5,9 @@ DEPENDENCIES
   commons
     git: https://github.com/Alfresco/chef-commons.git
     revision: d4ff9f8afd40e1006d2f6fb8867f116bc3556789
+  database
+    git: https://github.com/enzor/database.git
+    revision: 416897fdc662766025eaf2ace668a3f3c62850c3
   file
     git: https://github.com/jenssegers/chef-file.git
     revision: 050c5554efcc024d9a058908280bfb05037f9848
@@ -23,7 +26,7 @@ GRAPH
     windows (>= 1.2.2)
   activemq (2.0.4)
     java (~> 1.13)
-  alfresco (0.6.23)
+  alfresco (0.6.29)
     activemq (>= 1.3.3)
     artifact-deployer (>= 0.8.16)
     build-essential (>= 2.2.3)
@@ -74,7 +77,7 @@ GRAPH
     yum-epel (>= 0.6.0)
   compat_resource (12.7.3)
   cpu (0.2.0)
-  database (4.0.9)
+  database (5.0.0)
     postgresql (>= 1.0.0)
   dmg (2.3.0)
   ffmpeg (0.4.4)
diff --git a/attributes/default.rb b/attributes/default.rb
index de96b2e..d83b77a 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -82,16 +82,6 @@
 #Mysql defaults
 default['mysql']['update_gcc'] = true
 
-# Java defaults
-default["java"]["default"] = true
-default["java"]["accept_license_agreement"] = true
-default["java"]["install_flavor"] = "oracle"
-default["java"]["jdk_version"] = "8"
-default["java"]["java_home"] = "/usr/lib/jvm/java"
-default["java"]["oracle"]['accept_oracle_download_terms']  = true
-
-default['java']['jdk']['8']['x86_64']['url'] = 'http://download.oracle.com/otn-pub/java/jdk/8u91-b14/jdk-8u91-linux-x64.tar.gz'
-default['java']['jdk']['8']['x86_64']['checksum'] = '3f3d7d0cd70bfe0feab382ed4b0e45c0'
 #3rd-party defaults
 default['alfresco']['imagemagick_version'] = "6.9.4-9"
 default['alfresco']['use_imagemagick_os_repo'] = true
diff --git a/attributes/java.rb b/attributes/java.rb
new file mode 100644
index 0000000..4fd4a7c
--- /dev/null
+++ b/attributes/java.rb
@@ -0,0 +1,7 @@
+# Java defaults
+default['java']['install_flavor'] = 'oracle'
+default['java']['jdk_version'] = '8'
+default['java']['java_home'] = '/usr/lib/jvm/java'
+default['java']['jdk']['8']['x86_64']['url'] = 'http://download.oracle.com/otn-pub/java/jdk/8u91-b14/jdk-8u91-linux-x64.tar.gz'
+default['java']['jdk']['8']['x86_64']['checksum'] = '3f3d7d0cd70bfe0feab382ed4b0e45c0'
+default['java']['oracle']['accept_oracle_download_terms'] = true
\ No newline at end of file
diff --git a/recipes/default.rb b/recipes/default.rb
index de56e49..346150e 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -37,7 +37,7 @@
 # enterprise = true if Float(node['alfresco']['version'].split('').last) or node['alfresco']['version'].end_with?("SNAPSHOT") rescue false
 # [New implementation]
 if node['alfresco']['edition'] == 'enterprise'
-  node.default['artifacts']['alfresco']['artifactId']    = "alfresco-enterprise"
+  node.default['artifacts']['alfresco']['artifactId'] = "alfresco-enterprise"
   unless node['alfresco']['version'].start_with?("5.1")
     node.default['artifacts']['share']['artifactId'] = "share-enterprise"
   end
@@ -63,7 +63,6 @@
 
 include_recipe 'java::default'
 
-
 if node['alfresco']['components'].include? 'yourkit'
   include_recipe "alfresco::yourkit"
 end
@@ -135,7 +134,7 @@
   include_recipe "alfresco::apply-amps"
 end
 
-if node['alfresco']['db_ssl_enabled'] == true
+if node['alfresco']['db_ssl_enabled']
   node.default['artifacts']['ssl-db-creds']['enabled'] = true
   execute "import key to RDS keystore" do
     command "keytool -import -alias RDSmysqlServerCACert -file #{node['artifacts']['ssl-db-creds']['destination']} -keystore #{node['alfresco']['keystore_file']}"