diff --git a/recipes/mongos.rb b/recipes/mongos.rb
index 175595e..3636d4f 100644
--- a/recipes/mongos.rb
+++ b/recipes/mongos.rb
@@ -72,7 +72,7 @@
     action :create
   end
   # Set `['runit']['prefer_local_yum'] = true` to avoid install yum repository through packagecloud cookbook
-  node.set['runit']['prefer_local_yum'] = true
+  node.default['runit']['prefer_local_yum'] = true
 end
 
 # Install runit service package through runit::default recipe
diff --git a/recipes/package_repo.rb b/recipes/package_repo.rb
index 6d774e0..a19bfd3 100644
--- a/recipes/package_repo.rb
+++ b/recipes/package_repo.rb
@@ -23,7 +23,7 @@
 pkg_version = node['mongodb3']['version']
 case node['platform_family']
   when 'rhel', 'fedora'
-    pkg_version =  "#{node['mongodb3']['version']}-1.el#{node.platform_version.to_i}" # ~FC019
+    pkg_version =  "#{node['mongodb3']['version']}-1.el#{node['platform_version'].to_i}" # ~FC019
     if node['platform'] == 'amazon'
       pkg_version = "#{node['mongodb3']['version']}-1.amzn1" # ~FC019
     end
@@ -53,34 +53,34 @@
 
 # MongoDB package version to install
 if node['mongodb3']['package']['version'].nil?
-  node.set['mongodb3']['package']['version'] = pkg_version
+  node.default['mongodb3']['package']['version'] = pkg_version
 end
 
 # MongoDB package repo url
 if node['mongodb3']['package']['repo']['url'].nil?
-  node.set['mongodb3']['package']['repo']['url'] = pkg_repo
+  node.default['mongodb3']['package']['repo']['url'] = pkg_repo
 end
 
 # MongoDB repository name
 if node['mongodb3']['package']['repo']['apt']['name'].nil?
-  node.set['mongodb3']['package']['repo']['apt']['name'] = pkg_major_version.to_s
+  node.default['mongodb3']['package']['repo']['apt']['name'] = pkg_major_version.to_s
 end
 
 # MongoDB apt keyserver and key
 if node['mongodb3']['package']['repo']['apt']['keyserver'].nil?
-  node.set['mongodb3']['package']['repo']['apt']['keyserver'] = apt_repo_keyserver
+  node.default['mongodb3']['package']['repo']['apt']['keyserver'] = apt_repo_keyserver
 end
 
 if node['mongodb3']['package']['repo']['apt']['key'].nil?
   if pkg_major_version >= 3.2
-    node.set['mongodb3']['package']['repo']['apt']['key'] = 'EA312927'
+    node.default['mongodb3']['package']['repo']['apt']['key'] = 'EA312927'
   else
-    node.set['mongodb3']['package']['repo']['apt']['key'] = '7F0CEB10'
+    node.default['mongodb3']['package']['repo']['apt']['key'] = '7F0CEB10'
   end
 end
 
 if node['mongodb3']['package']['repo']['apt']['components'].nil?
-  node.set['mongodb3']['package']['repo']['apt']['components'] = apt_repo_component
+  node.default['mongodb3']['package']['repo']['apt']['components'] = apt_repo_component
 end
 
 # Add the MongoDB Package repository
diff --git a/test/cookbooks/mongodb3-test/recipes/custom.rb b/test/cookbooks/mongodb3-test/recipes/custom.rb
index 26bcfd3..0c78d0d 100644
--- a/test/cookbooks/mongodb3-test/recipes/custom.rb
+++ b/test/cookbooks/mongodb3-test/recipes/custom.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-node.set['mongodb3']['config']['mongod']['storage']['dbPath'] = '/var/lib/mongodb/custom'
-node.set['mongodb3']['config']['mongod']['systemLog']['path'] = '/var/log/mongodb/custom/mongod.log'
+node.default['mongodb3']['config']['mongod']['storage']['dbPath'] = '/var/lib/mongodb/custom'
+node.default['mongodb3']['config']['mongod']['systemLog']['path'] = '/var/log/mongodb/custom/mongod.log'
 
 include_recipe 'mongodb3::default'
diff --git a/test/cookbooks/mongodb3-test/recipes/default-30x.rb b/test/cookbooks/mongodb3-test/recipes/default-30x.rb
index e2f5b24..fa08aa3 100644
--- a/test/cookbooks/mongodb3-test/recipes/default-30x.rb
+++ b/test/cookbooks/mongodb3-test/recipes/default-30x.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-node.set['mongodb3']['version'] = '3.0.11'
+node.default['mongodb3']['version'] = '3.0.11'
 
 # For package upgrade testing : executing converge twice with different version
 # node.set['mongodb3']['version'] = '3.2.4'
diff --git a/test/cookbooks/mongodb3-test/recipes/mms_automation_agent_with_data_bag.rb b/test/cookbooks/mongodb3-test/recipes/mms_automation_agent_with_data_bag.rb
index 8d2c80b..c01a095 100644
--- a/test/cookbooks/mongodb3-test/recipes/mms_automation_agent_with_data_bag.rb
+++ b/test/cookbooks/mongodb3-test/recipes/mms_automation_agent_with_data_bag.rb
@@ -34,7 +34,7 @@
 mms_data_bag_item = Chef::EncryptedDataBagItem.load('mongodb', 'mms-agent')
 mms_data_bag = mms_data_bag_item['environments'][node.chef_environment]
 
-node.set['mongodb3']['config']['mms']['mmsGroupId'] = mms_data_bag['mms_group_id']
-node.set['mongodb3']['config']['mms']['mmsApiKey'] = mms_data_bag['mms_api_key']
+node.default['mongodb3']['config']['mms']['mmsGroupId'] = mms_data_bag['mms_group_id']
+node.default['mongodb3']['config']['mms']['mmsApiKey'] = mms_data_bag['mms_api_key']
 
 include_recipe 'mongodb3::mms_automation_agent'