diff --git a/main.tf b/main.tf
index 5e1f256..8b8893b 100644
--- a/main.tf
+++ b/main.tf
@@ -48,18 +48,18 @@ resource "helm_release" "loki" {
       loki_image_registry          = module.images.images[local.loki_key].dest_registry
       loki_image_repository        = module.images.images[local.loki_key].dest_repository
       loki_image_tag               = module.images.images[local.loki_key].tag
-      provisioner_image_repository = split(":", module.images.images[local.provisioner_key].dest_full_path)[0]
+      provisioner_image_repository = module.images.images[local.provisioner_key].dest_repository
       provisioner_image_tag        = module.images.images[local.provisioner_key].tag
       gateway_image_repository     = module.images.images[local.gateway_key].dest_repository
       gateway_image_tag            = module.images.images[local.gateway_key].tag
-      sidecar_image_repository     = split(":", module.images.images[local.sidecar_key].dest_full_path)[0]
+      sidecar_image_repository     = module.images.images[local.sidecar_key].dest_repository
       sidecar_image_tag            = module.images.images[local.sidecar_key].tag
-      memcached_image_repository   = split(":", module.images.images[local.memcached_key].dest_full_path)[0]
+      memcached_image_repository   = module.images.images[local.memcached_key].dest_repository
       memcached_image_tag          = module.images.images[local.memcached_key].tag
-      exporter_image_repository    = split(":", module.images.images[local.exporter_key].dest_full_path)[0]
+      exporter_image_repository    = module.images.images[local.exporter_key].dest_repository
       exporter_image_tag           = module.images.images[local.exporter_key].tag
       # Storage configuration
-      s3_bucket_name = module.loki_s3.s3_requested_bucket_name
+      s3_bucket_name = module.loki_s3.s3_module_settings.bucket_name
       region         = var.region
       # Storage classes
       rwo_storage_class = var.rwo_storage_class