diff --git a/main.tf b/main.tf
index 5e4f549..17d1276 100644
--- a/main.tf
+++ b/main.tf
@@ -97,11 +97,11 @@ resource "helm_release" "loki" {
   #### Gateway Image #####
   set {
     name  = "gateway.image.repository"
-    value = module.images.images[local.provisioner_key].dest_repository
+    value = module.images.images[local.gateway_key].dest_repository
   }
   set {
     name  = "gateway.image.tag"
-    value = module.images.images[local.provisioner_key].tag
+    value = module.images.images[local.gateway_key].tag
   }
 
   ##### grafana/loki-canary #####
@@ -244,27 +244,27 @@ resource "helm_release" "loki" {
 
   ##### Compactor Config #####
   set {
-    name  = "loki.compactor.working_directory"
+    name  = "compactor.working_directory"
     value = "/loki/compactor"
   }
   set {
-    name  = "loki.compactor.shared_store"
+    name  = "compactor.shared_store"
     value = "s3"
   }
   set {
-    name  = "loki.compactor.compaction_interval"
+    name  = "compactor.compaction_interval"
     value = "10m"
   }
   set {
-    name  = "loki.compactor.retention_enabled"
+    name  = "compactor.retention_enabled"
     value = "true"
   }
   set {
-    name  = "loki.compactor.retention_delete_delay"
+    name  = "compactor.retention_delete_delay"
     value = "2h"
   }
   set {
-    name  = "loki.compactor.retention_delete_worker_count"
+    name  = "compactor.retention_delete_worker_count"
     value = "150"
   }