diff --git a/metadata.rb b/metadata.rb
index e2e0261..472dd25 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -4,7 +4,7 @@
 license 'Apache v2.0'
 description 'Installs/Configures Ceph (Hammer and above)'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '0.9.6'
+version '0.9.7'
 
 depends	'apache2', '>= 1.1.12'
 depends 'apt'
diff --git a/recipes/conf.rb b/recipes/conf.rb
index 6cad3b3..1f4ac79 100644
--- a/recipes/conf.rb
+++ b/recipes/conf.rb
@@ -29,7 +29,7 @@
 directory '/etc/ceph' do
   owner node['ceph']['owner']
   group node['ceph']['group']
-  mode '0644'
+  mode node['ceph']['mode']
   action :create
   not_if "test -f /etc/ceph"
 end
diff --git a/recipes/osd.rb b/recipes/osd.rb
index 559b22a..6d6c3f9 100644
--- a/recipes/osd.rb
+++ b/recipes/osd.rb
@@ -60,9 +60,9 @@
 # Create the scripts directory within the /etc/ceph directory. This is not standard Ceph. It's included here as
 # a place to hold helper scripts mainly for OSD and Journal maintenance
 directory '/etc/ceph/scripts' do
-  owner 'root'
-  group 'root'
-  mode '0755'
+  owner node['ceph']['owner']
+  group node['ceph']['group']
+  mode node['ceph']['mode']
   recursive true
   action :create
   not_if "test -d /etc/ceph/scripts"
@@ -71,16 +71,22 @@
 # Add ceph_journal.sh helper script to all OSD nodes and place it in /etc/ceph
 cookbook_file '/etc/ceph/scripts/ceph_journal.sh' do
   source 'ceph_journal.sh'
-  owner 'root'
-  group 'root'
-  mode '0755'
+  # owner 'root'
+  # group 'root'
+  # mode '0755'
+  owner node['ceph']['owner']
+  group node['ceph']['group']
+  mode node['ceph']['mode']
   not_if "test -f /etc/ceph/scripts/ceph_journal.sh"
 end
 
 directory '/var/lib/ceph/bootstrap-osd' do
-  owner 'root'
-  group 'root'
-  mode '0755'
+  # owner 'root'
+  # group 'root'
+  # mode '0755'
+  owner node['ceph']['owner']
+  group node['ceph']['group']
+  mode node['ceph']['mode']
   recursive true
   action :create
   not_if "test -d /var/lib/ceph/bootstrap-osd"
@@ -88,9 +94,12 @@
 
 # Default data location - do not modify
 directory '/var/lib/ceph/osd' do
-  owner 'root'
-  group 'root'
-  mode '0755'
+  # owner 'root'
+  # group 'root'
+  # mode '0755'
+  owner node['ceph']['owner']
+  group node['ceph']['group']
+  mode node['ceph']['mode']
   recursive true
   action :create
   not_if "test -d /var/lib/ceph/osd"