diff --git a/attributes/default.rb b/attributes/default.rb
index 226b8f64e..1cac79fe0 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -5,8 +5,8 @@
 
 # Initialize the node attributes with node attributes merged with data bag attributes
 #
-node.set[:elasticsearch] ||= {}
-node.set[:elasticsearch]   = DeepMerge.merge(node[:elasticsearch].to_hash, settings.to_hash)
+node.default[:elasticsearch] ||= {}
+node.default[:elasticsearch]   = DeepMerge.merge(node.default[:elasticsearch].to_hash, settings.to_hash)
 
 # === VERSION AND LOCATION
 #
diff --git a/recipes/aws.rb b/recipes/aws.rb
index cfa55e0f6..16a014186 100644
--- a/recipes/aws.rb
+++ b/recipes/aws.rb
@@ -1,3 +1,3 @@
-node.set[:elasticsearch][:plugin][:mandatory] = node[:elasticsearch][:plugin][:mandatory] | ['cloud-aws']
+node.default[:elasticsearch][:plugin][:mandatory] = node[:elasticsearch][:plugin][:mandatory] | ['cloud-aws']
 
 install_plugin "elasticsearch/elasticsearch-cloud-aws/#{node.elasticsearch[:plugins][:aws][:version]}"