diff --git a/lib/ironfan/chef_layer.rb b/lib/ironfan/chef_layer.rb
index 9ee09763..eadbd7c3 100644
--- a/lib/ironfan/chef_layer.rb
+++ b/lib/ironfan/chef_layer.rb
@@ -192,7 +192,6 @@ def _update_chef_node
       end
     end
 
-
     def sync_volume_attributes
       composite_volumes.each do |vol_name, vol|
         chef_node.normal[:volumes] ||= Mash.new
@@ -203,11 +202,11 @@ def sync_volume_attributes
     def set_chef_node_attributes
       step("  setting node runlist and essential attributes")
       @chef_node.run_list = Chef::RunList.new(*@settings[:run_list])
-      @chef_node.normal[:organization]   = organization if organization
-      @chef_node.normal[:permanent]      = cloud.permanent if cloud.permanent
-      @chef_node.override[:cluster_name] = cluster_name
-      @chef_node.override[:facet_name]   = facet_name
-      @chef_node.override[:facet_index]  = facet_index
+      @chef_node.normal[:organization] = organization if organization
+      @chef_node.normal[:permanent]    = cloud.permanent if cloud.permanent
+      @chef_node.normal[:cluster_name] = cluster_name
+      @chef_node.normal[:facet_name]   = facet_name
+      @chef_node.normal[:facet_index]  = facet_index
     end
 
     def set_chef_node_environment