diff --git a/manifests/init.pp b/manifests/init.pp
index 9e0b2cd..b00f5d8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -12,6 +12,16 @@ class grafana (
   $container_port = '3000',
   $configuration = {}, # Refer to https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/
 ) {
+  $env = [
+    "GF_PATHS_CONFIG=${container_config_folder}/grafana.ini",
+    "GF_PATHS_DATA=${$container_data_folder}",
+    'GF_PATHS_HOME=/usr/share/grafana',
+    "GF_PATHS_LOGS=${container_logs_folder}",
+    "GF_PATHS_PLUGINS=${container_data_folder}/plugins",
+    "GF_PATHS_PROVISIONING=${container_config_folder}/provisioning",
+    'GF_LOG_MODE=console file',
+    "GF_SECURITY_ADMIN_USER=${admin_password}",
+  ]
   if (!$container_mount_data_folder) {
     podman::volume{$container_volume_name:}
     $flags = {
@@ -21,6 +31,7 @@ class grafana (
               volume  => [
                 "${container_volume_name}:/var/lib/grafana",
               ],
+              env     => $env,
               }
   } else {
     file {$container_data_folder:
@@ -41,28 +52,15 @@ class grafana (
                 "${container_config_folder}:/etc/grafana",
                 "${container_logs_folder}:/var/log/grafana",
               ],
+              env     => $env,
               }
     file { "${container_config_folder}/grafana.ini":
       ensure  => present,
       content => template('grafana/grafana.ini.erb'),
     }
   }
-  $env = [
-    "GF_PATHS_CONFIG=${container_config_folder}/grafana.ini",
-    "GF_PATHS_DATA=${$container_data_folder}",
-    'GF_PATHS_HOME=/usr/share/grafana',
-    "GF_PATHS_LOGS=${container_logs_folder}",
-    "GF_PATHS_PLUGINS=${container_data_folder}/plugins",
-    "GF_PATHS_PROVISIONING=${container_config_folder}/provisioning",
-    'GF_LOG_MODE=console file',
-    "GF_SECURITY_ADMIN_USER=${admin_password}",
-  ]
-  podman::image { $container_name:
-    image    => $container_image_name,
-    exec_env => $env,
-  }
   podman::container { $container_name:
-    image         => $container_name,
+    image         => $container_image_name,
     flags         => $flags,
     service_flags => {
       timeout => '180'