diff --git a/copy_images.tf b/copy_images.tf
index 2e482a3..4264bfc 100644
--- a/copy_images.tf
+++ b/copy_images.tf
@@ -57,7 +57,7 @@ locals {
       enabled         = true
       dest_path       = null
       name            = "grafana/nginx-unprivileged"
-      source_image    = "opensource/nginx/nginx-alpine"
+      source_image    = "opensource/nginx/nginx"
       source_registry = format("%v/%v", local.ent_ecr_source, "ironbank")
       source_tag      = var.gateway_tag
       tag             = var.gateway_tag
diff --git a/main.tf b/main.tf
index 5e1f256..7ecb133 100644
--- a/main.tf
+++ b/main.tf
@@ -30,6 +30,11 @@ module "loki_irsa_role" {
 }
 
 resource "helm_release" "loki" {
+  depends_on = [
+    module.images,
+    module.loki_irsa_role,
+    module.loki_s3
+  ]
   atomic          = true
   chart           = "loki"
   cleanup_on_fail = true
@@ -48,18 +53,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
diff --git a/values/loki.yml.tpl b/values/loki.yml.tpl
index c1085a8..d6ae27b 100644
--- a/values/loki.yml.tpl
+++ b/values/loki.yml.tpl
@@ -41,16 +41,16 @@ loki:
           period: 24h
   # Storage configuration
   storage:
-    type: s3
-    bucketNames:
-      admin: ${s3_bucket_name}
-      chunks: ${s3_bucket_name}
-      ruler: ${s3_bucket_name}
-    s3:
-      s3: s3://${region}
-      bucketName: ${s3_bucket_name}
-      region: ${region}
-      s3ForcePathStyle: false
+      bucketNames:
+        admin: ${s3_bucket_name}
+        chunks: ${s3_bucket_name}
+        ruler: ${s3_bucket_name}
+  storage_cofig:
+    aws:
+      s3:
+        bucketName: ${s3_bucket_name}
+        region: ${region}
+        s3ForcePathStyle: false
   tracing:
     enabled: true