diff --git a/manifests/init.pp b/manifests/init.pp
index b00f5d8..436c7df 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -22,6 +22,9 @@ class grafana (
     'GF_LOG_MODE=console file',
     "GF_SECURITY_ADMIN_USER=${admin_password}",
   ]
+  user {'grafana':
+    ensure => present,
+  }
   if (!$container_mount_data_folder) {
     podman::volume{$container_volume_name:}
     $flags = {
@@ -36,12 +39,15 @@ class grafana (
   } else {
     file {$container_data_folder:
       ensure => directory,
+      owner  => 'grafana',
     }
     file {$container_logs_folder:
       ensure => directory,
+      owner  => 'grafana',
     }
     file {$container_config_folder:
       ensure => directory,
+      owner  => 'grafana',
     }
     $flags = {
               publish => [