diff --git a/manifests/config.pp b/manifests/config.pp
index 606e021a..a0167caf 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -9,8 +9,8 @@
   require logstash::package
 
   File {
-    owner => 'root',
-    group => 'root',
+    owner => $logstash::logstash_user,
+    group => $logstash::logstash_group,
   }
 
   # Configuration "fragment" directories for pipeline config and pattern files.
@@ -21,14 +21,14 @@
   if($logstash::ensure == 'present') {
     file { $logstash::config_dir:
       ensure => directory,
-      mode   => '0755',
+      mode   => '0750',
     }
 
     file { "${logstash::config_dir}/conf.d":
       ensure  => directory,
       purge   => $logstash::purge_config,
       recurse => $logstash::purge_config,
-      mode    => '0775',
+      mode    => '0770',
       notify  => Service['logstash'],
     }
 
@@ -36,7 +36,7 @@
       ensure  => directory,
       purge   => $logstash::purge_config,
       recurse => $logstash::purge_config,
-      mode    => '0755',
+      mode    => '0750',
     }
   }
   elsif($logstash::ensure == 'absent') {
diff --git a/manifests/configfile.pp b/manifests/configfile.pp
index df3484dc..b0698d76 100644
--- a/manifests/configfile.pp
+++ b/manifests/configfile.pp
@@ -50,7 +50,7 @@
 {
   include logstash
 
-  $owner = 'root'
+  $owner = $logstash::logstash_user
   $group = $logstash::logstash_group
   $mode  = '0640'
   $require = Package['logstash'] # So that we have '/etc/logstash/conf.d'.
diff --git a/manifests/patternfile.pp b/manifests/patternfile.pp
index 4490ff15..959a4bc1 100644
--- a/manifests/patternfile.pp
+++ b/manifests/patternfile.pp
@@ -30,7 +30,7 @@
   file { "${logstash::config_dir}/patterns/${destination}":
     ensure => file,
     source => $source,
-    owner  => 'root',
+    owner  => $logstash::logstash_user,
     group  => $logstash::logstash_group,
     mode   => '0640',
     tag    => ['logstash_config'],
diff --git a/manifests/service.pp b/manifests/service.pp
index d3b15b6a..591caf82 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -50,9 +50,9 @@
   $pipelines = $logstash::pipelines
 
   File {
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0644',
+    owner  => $logstash::logstash_user,
+    group  => $logstash::logstash_group,
+    mode   => '0640',
     notify => Exec['logstash-system-install'],
   }