diff --git a/metadata.rb b/metadata.rb
index 22f6e57..f1e7e68 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -7,6 +7,6 @@
 long_description 'Resource Cookbook for Managing Chef Software Inc Product Suite'
 issues_url 'https://github.com/ncerny/chef_stack/issues' if respond_to?(:issues_url)
 source_url 'https://github.com/ncerny/chef_stack' if respond_to?(:source_url)
-version '0.5.2'
+version '0.5.10'
 
 depends 'chef-ingredient'
diff --git a/resources/wf_builder.rb b/resources/wf_builder.rb
index 8d87e3d..492f4d3 100644
--- a/resources/wf_builder.rb
+++ b/resources/wf_builder.rb
@@ -96,15 +96,15 @@
     chef_file "#{workspace}/#{dir}/builder_key" do
       source new_resource.builder_pem
       mode '0600'
-      user 'root'
-      group 'root'
+      user 'dbuild'
+      group 'dbuild'
     end
 
     chef_file "#{workspace}/#{dir}/#{chef_user}.pem" do
       source new_resource.chef_user_pem
       mode '0600'
-      user 'root'
-      group 'root'
+      user 'dbuild'
+      group 'dbuild'
     end
   end
 
@@ -113,7 +113,7 @@
       content ensurekv(::File.read('/etc/chef/client.rb'),
                        node_name: new_resource.chef_user,
                        log_location: 'STDOUT',
-                       client_key: "#{workspace}/#{dir}/#{new_resource.chef_user}.pem",
+                       client_key: "#{workspace}/.chef/#{new_resource.chef_user}.pem",
                        trusted_certs_dir: '/etc/chef/trusted_certs'
                       )
       mode '0644'