diff --git a/data/templates/grafana.ini.pktpl.hcl b/data/templates/grafana.ini.pktpl.hcl
index bd5f3a4..195da43 100644
--- a/data/templates/grafana.ini.pktpl.hcl
+++ b/data/templates/grafana.ini.pktpl.hcl
@@ -1,4 +1,4 @@
-%{ if AuthEnabled ~}
+%{ if .Vars.AuthEnabled ~}
 auth_enabled: true
 %{ else }
 auth_enabled: false
diff --git a/data/templates/loki-local-config.pktpl.hcl b/data/templates/loki-local-config.pktpl.hcl
index 9fd10f7..8064e39 100644
--- a/data/templates/loki-local-config.pktpl.hcl
+++ b/data/templates/loki-local-config.pktpl.hcl
@@ -1,18 +1,18 @@
-%{ if AuthEnabled ~}
+%{ if Vars.Loki.AuthEnabled ~}
 auth_enabled: true
 %{ else }
 auth_enabled: false
 %{ endif }
 
 server:
-  http_listen_port: ${HTTPPort}
-  grpc_listen_port: ${GRPCPort}
-  log_level: ${LogLevel}
+  http_listen_port: ${Vars.Loki.HTTPPort}
+  grpc_listen_port: ${Vars.Loki.GRPCPort}
+  log_level: ${Vars.Loki.LogLevel}
 
 ingester:
   wal:
     enabled: true
-    dir: ${StorageRoot}/wal
+    dir: ${Vars.Loki.StorageRoot}/wal
     flush_on_shutdown: true
   lifecycler:
     address: 127.0.0.1
@@ -23,7 +23,7 @@ ingester:
     final_sleep: 0s
   chunk_idle_period: 1h       # Any chunk not receiving new logs in this time will be flushed
   max_chunk_age: 1h           # All chunks will be flushed when they hit this age, default is 1h
-  chunk_target_size: 1048576  # Loki will attempt to build chunks up to 1.5MB, flushing first if chunk_idle_period or max_chunk_age is reached first
+  chunk_target_size: 1048576  # Vars.Loki will attempt to build chunks up to 1.5MB, flushing first if chunk_idle_period or max_chunk_age is reached first
   chunk_retain_period: 30s    # Must be greater than index read cache TTL if using an index cache (Default index read cache TTL is 5m)
   max_transfer_retries: 0     # Chunk transfers disabled
 
@@ -31,31 +31,31 @@ schema_config:
   configs:
   - from: 2020-05-15
     store: boltdb-shipper
-    object_store: ${ObjectStore}
+    object_store: ${Vars.Loki.ObjectStore}
     schema: v11
     index:
       prefix: index_
       period: 24h
 
 storage_config:
- boltdb_shipper:
-   active_index_directory: ${StorageRoot}/index
-   shared_store: ${SharedStore}
-   cache_location: ${StorageRoot}/cache
-   cache_ttl: 168h
+  boltdb_shipper:
+    active_index_directory: ${Vars.Loki.StorageRoot}/index
+    shared_store: ${Vars.Loki.SharedStore}
+    cache_location: ${Vars.Loki.StorageRoot}/cache
+    cache_ttl: 168h
 
-%{ if ObjectStore == "filesystem" ~}
+%{ if Vars.Loki.ObjectStore == "filesystem" ~}
   filesystem:
-    directory: ${StorageRoot}/chunks
+    directory: ${Vars.Loki.StorageRoot}/chunks
 %{ else }
   aws:
-    s3: s3://${S3.APIKey}:${S3.APISecretKey}@${S3.URL}/${S3.BucketName}
+    s3: s3://${Vars.Loki.S3.APIKey}:${Vars.Loki.S3.APISecretKey}@${Vars.Loki.S3.URL}/${Vars.Loki.S3.BucketName}
     s3forcepathstyle: true
 %{ endif }
 
 compactor:
-  shared_store: ${SharedStore}
-  working_directory: ${StorageRoot}/compactor
+  shared_store: ${Vars.Loki.SharedStore}
+  working_directory: ${Vars.Loki.StorageRoot}/compactor
   compaction_interval: 10m
 
 limits_config:
@@ -73,10 +73,10 @@ ruler:
   storage:
     type: local
     local:
-      directory: ${StorageRoot}/rules
-  rule_path: ${StorageRoot}/rules
-  alertmanager_url: ${AlertManagerURL}
+      directory: ${Vars.Loki.StorageRoot}/rules
+  rule_path: ${Vars.Loki.StorageRoot}/rules
+  alertmanager_url: ${Vars.Loki.AlertManagerURL}
   ring:
     kvstore:
       store: inmemory
-  enable_api: true
\ No newline at end of file
+  enable_api: true
diff --git a/data/templates/loki-local-config.tpl b/data/templates/loki-local-config.tpl
index 07cd8c8..a0de866 100644
--- a/data/templates/loki-local-config.tpl
+++ b/data/templates/loki-local-config.tpl
@@ -1,18 +1,18 @@
-{{ if .AuthEnabled  }}
+{{ if .Vars.AuthEnabled  }}
 auth_enabled: true
 {{ else  }}
 auth_enabled: false
 {{ end  }}
 
 server:
-  http_listen_port: {{ .HTTPPort }}
-  grpc_listen_port: {{ .GRPCPort }}
+  http_listen_port: {{ .Vars.HTTPPort }}
+  grpc_listen_port: {{ .Vars.GRPCPort }}
   log_level: {{ .LogLevel }}
 
 ingester:
   wal:
     enabled: true
-    dir: {{ .StorageRoot }}/wal
+    dir: {{ .Vars.StorageRoot }}/wal
     flush_on_shutdown: true
   lifecycler:
     address: 127.0.0.1
@@ -31,7 +31,7 @@ schema_config:
   configs:
   - from: 2020-05-15
     store: boltdb-shipper
-    object_store: {{ .ObjectStore }}
+    object_store: {{ .Vars.ObjectStore }}
     schema: v11
     index:
       prefix: index_
@@ -39,23 +39,23 @@ schema_config:
 
 storage_config:
  boltdb_shipper:
-   active_index_directory: {{ .StorageRoot }}/index
-   shared_store: {{ .SharedStore }}
-   cache_location: {{ .StorageRoot }}/cache
+   active_index_directory: {{ .Vars.StorageRoot }}/index
+   shared_store: {{ .Vars.SharedStore }}
+   cache_location: {{ .Vars.StorageRoot }}/cache
    cache_ttl: 168h
 
 {{ if eq (.ObjectStore) ("filesystem") }}
   filesystem:
-    directory: {{ .StorageRoot }}/chunks
+    directory: {{ .Vars.StorageRoot }}/chunks
 {{ else  }}
   aws:
-    s3: s3://{{ .S3.APIKey }}:{{ .S3.APISecretKey}}@{{ .S3.URL}}/{{ .S3.BucketName}}
+    s3: s3://{{ .Vars.S3.APIKey }}:{{ .Vars.S3.APISecretKey}}@{{ .S3.URL}}/{{ .S3.BucketName}}
     s3forcepathstyle: true
 {{ end  }}
 
 compactor:
-  shared_store: {{ .SharedStore }}
-  working_directory: {{ .StorageRoot }}/compactor
+  shared_store: {{ .Vars.SharedStore }}
+  working_directory: {{ .Vars.StorageRoot }}/compactor
   compaction_interval: 10m
 
 limits_config:
@@ -73,9 +73,9 @@ ruler:
   storage:
     type: local
     local:
-      directory: {{ .StorageRoot }}/rules
-  rule_path: {{ .StorageRoot }}/rules
-  alertmanager_url: {{ .AlertManagerURL }}
+      directory: {{ .Vars.StorageRoot }}/rules
+  rule_path: {{ .Vars.StorageRoot }}/rules
+  alertmanager_url: {{ .Vars.AlertManagerURL }}
   ring:
     kvstore:
       store: inmemory