diff --git a/terraform/modules/aws-ecr/main.tf b/terraform/modules/aws-ecr/main.tf
index 01b32d8..a7ee5fa 100644
--- a/terraform/modules/aws-ecr/main.tf
+++ b/terraform/modules/aws-ecr/main.tf
@@ -1,35 +1,40 @@
 
 resource "aws_ecr_repository" "this" {
-  count                = var.create_ecr_repository ? 1 : 0
-  name                 = var.name
-  image_tag_mutability = var.image_tag_mutability
+  for_each             = var.repositories
+
+  name                 = each.key
+  image_tag_mutability = each.value.image_tag_mutability
   image_scanning_configuration {
-    scan_on_push = var.scan_on_push
+    scan_on_push       = each.value.scan_on_push
   }
 
   tags = var.tags
 }
 
 resource "aws_ecr_lifecycle_policy" "this" {
-  count      = var.create_ecr_repository ? 1 : 0
-  repository = aws_ecr_repository.this[0].name
-  policy     = <<POLICY
-  {
-    "rules": [
-      {
-        "rulePriority": 1,
-        "description": "Expire untagged images older than 14 days",
-        "selection": {
-          "tagStatus": "untagged",
-          "countType": "sinceImagePushed",
-          "countUnit": "days",
-          "countNumber": 14
+  for_each             = { for k, v in var.repositories : k => v if length(v.lifecycle_policies) > 0 }
+
+  repository = aws_ecr_repository.this[each.key].name
+
+  policy = jsonencode({
+    rules = [
+      for policy in each.value.lifecycle_policies : merge({
+        rulePriority = index(each.value.lifecycle_policies, policy) + 1
+        description  = policy.description
+        selection = merge({
+          tagStatus   = policy.tag_status
+          countType   = "sinceImagePushed"
+          countUnit   = policy.count_unit
+          countNumber = policy.count_number
         },
-        "action": {
-          "type": "expire"
+        # Conditionally add tagPrefixList only if tag_status is "tagged"
+        policy.tag_status == "tagged" ? {
+          tagPrefixList = "${policy.tagPrefixLists}"
+        } : {})
+        action = {
+          type = "expire"
         }
-      }
+      })
     ]
-  }
-  POLICY
+  })
 }
diff --git a/terraform/modules/aws-ecr/outputs.tf b/terraform/modules/aws-ecr/outputs.tf
index 55f2260..9ee302a 100644
--- a/terraform/modules/aws-ecr/outputs.tf
+++ b/terraform/modules/aws-ecr/outputs.tf
@@ -1,9 +1,9 @@
 output "ecr_repository_url" {
-  value = var.create_ecr_repository ? aws_ecr_repository.this[0].repository_url : ""
+  value = { for repository in aws_ecr_repository.this : repository.name => repository.repository_url }
   description = "The URL of the ECR repository, or empty if not created."
 }
 
 output "ecr_repository_arn" {
-  value = var.create_ecr_repository ? aws_ecr_repository.this[0].arn : ""
+  value = { for repository in aws_ecr_repository.this : repository.name => repository.arn }
   description = "The ARN of the ECR repository, or empty if not created."
 }
diff --git a/terraform/modules/aws-ecr/variables.tf b/terraform/modules/aws-ecr/variables.tf
index 96aefa3..577a188 100644
--- a/terraform/modules/aws-ecr/variables.tf
+++ b/terraform/modules/aws-ecr/variables.tf
@@ -1,25 +1,15 @@
-variable "name" {
-  description = "The name of the ECR repository"
-  type        = string
-  default     = "maddevs"
-}
-
-variable "image_tag_mutability" {
-  description = "The tag mutability setting for the repository"
-  type        = string
-  default     = "MUTABLE"
-}
-
-variable "scan_on_push" {
-  description = "Enable image scanning on push"
-  type        = bool
-  default     = true
-}
-
-variable "create_ecr_repository" {
-  description = "Enable or not create ECR repository"
-  type        = bool
-  default     = false
+variable "repositories" {
+  type                   = map(object({
+    image_tag_mutability = string
+    scan_on_push         = bool
+    lifecycle_policies   = list(object({
+      tag_status         = string
+      count_unit         = string
+      tagPrefixLists     = list(string)
+      count_number       = number
+      description        = string
+    }))
+  }))
 }
 
 variable "tags" {
diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/aws-ecr/terragrunt.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/aws-ecr/terragrunt.hcl
deleted file mode 100644
index 044085d..0000000
--- a/terragrunt/ACCOUNT_ID/us-east-1/demo/aws-ecr/terragrunt.hcl
+++ /dev/null
@@ -1,39 +0,0 @@
-include "root" {
-  path   = find_in_parent_folders()
-  expose = true
-}
-
-include "env" {
-  path   = find_in_parent_folders("env.hcl")
-  expose = true
-}
-
-dependencies {
-  paths = ["../karpenter"]
-}
-
-generate "providers_versions" {
-  path      = "versions.tf"
-  if_exists = "overwrite"
-  contents  = <<EOF
-terraform {
-  required_version = ">= 1.8.3"
-
-  required_providers {
-    aws = {
-      source  = "hashicorp/aws"
-      version = "${include.root.locals.tf_providers.aws}"
-    }
-  }
-}
-EOF
-}
-
-terraform {
-  source = "${get_path_to_repo_root()}/terraform//modules/aws-ecr"
-}
-
-inputs = {
-  name                  = include.env.locals.name
-  create_ecr_repository = include.env.locals.values.create_ecr_repository
-}
diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/aws-ecr/.terraform.lock.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-ecr/.terraform.lock.hcl
similarity index 100%
rename from terragrunt/ACCOUNT_ID/us-east-1/demo/aws-ecr/.terraform.lock.hcl
rename to terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-ecr/.terraform.lock.hcl
diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-ecr/terragrunt.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-ecr/terragrunt.hcl
new file mode 100644
index 0000000..c60f4b2
--- /dev/null
+++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-ecr/terragrunt.hcl
@@ -0,0 +1,56 @@
+include "root" {
+  path   = find_in_parent_folders()
+  expose = true
+}
+
+include "env" {
+  path   = find_in_parent_folders("env.hcl")
+  expose = true
+}
+
+generate "providers_versions" {
+  path      = "versions.tf"
+  if_exists = "overwrite"
+  contents  = <<EOF
+terraform {
+  required_version = ">= 1.8.3"
+
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "${include.root.locals.tf_providers.aws}"
+    }
+  }
+}
+EOF
+}
+
+terraform {
+  source = "${get_path_to_repo_root()}/terraform//modules/aws-ecr"
+}
+
+inputs = {
+  repositories = {
+    "${include.env.locals.name}" = {
+      image_tag_mutability = "MUTABLE"
+      scan_on_push         = true
+
+      lifecycle_policies = [
+        {
+          tag_status         = "tagged"
+          count_unit         = "days"
+          count_number       = 7
+          tagPrefixLists     = ["${include.env.locals.name}"]
+          description        = "Keep image for 24 hours"
+        },
+        {
+          tag_status         = "untagged"
+          count_unit         = "days"
+          count_number       = 1
+          tagPrefixLists     = []
+          description        = "Keep image for 7 days"
+        }
+      ]
+    }
+  }
+}
diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/.terraform.lock.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/.terraform.lock.hcl
index 1d2d727..ac4ca73 100644
--- a/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/.terraform.lock.hcl
+++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/.terraform.lock.hcl
@@ -120,25 +120,6 @@ provider "registry.terraform.io/hashicorp/kubernetes" {
   ]
 }
 
-provider "registry.terraform.io/hashicorp/null" {
-  version = "3.2.2"
-  hashes = [
-    "h1:zT1ZbegaAYHwQa+QwIFugArWikRJI9dqohj8xb0GY88=",
-    "zh:3248aae6a2198f3ec8394218d05bd5e42be59f43a3a7c0b71c66ec0df08b69e7",
-    "zh:32b1aaa1c3013d33c245493f4a65465eab9436b454d250102729321a44c8ab9a",
-    "zh:38eff7e470acb48f66380a73a5c7cdd76cc9b9c9ba9a7249c7991488abe22fe3",
-    "zh:4c2f1faee67af104f5f9e711c4574ff4d298afaa8a420680b0cb55d7bbc65606",
-    "zh:544b33b757c0b954dbb87db83a5ad921edd61f02f1dc86c6186a5ea86465b546",
-    "zh:696cf785090e1e8cf1587499516b0494f47413b43cb99877ad97f5d0de3dc539",
-    "zh:6e301f34757b5d265ae44467d95306d61bef5e41930be1365f5a8dcf80f59452",
-    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
-    "zh:913a929070c819e59e94bb37a2a253c228f83921136ff4a7aa1a178c7cce5422",
-    "zh:aa9015926cd152425dbf86d1abdbc74bfe0e1ba3d26b3db35051d7b9ca9f72ae",
-    "zh:bb04798b016e1e1d49bcc76d62c53b56c88c63d6f2dfe38821afef17c416a0e1",
-    "zh:c23084e1b23577de22603cff752e59128d83cfecc2e6819edadd8cf7a10af11e",
-  ]
-}
-
 provider "registry.terraform.io/hashicorp/random" {
   version = "3.6.2"
   hashes = [
diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/terragrunt.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/terragrunt.hcl
index 90a70ea..57147fd 100644
--- a/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/terragrunt.hcl
+++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/terragrunt.hcl
@@ -52,7 +52,7 @@ dependency "aws-r53" {
 }
 
 dependencies {
-  paths = ["../karpenter", "../aws-ecr"]
+  paths = ["../karpenter"]
 }
 
 generate "providers_versions" {