diff --git a/live/common-infra/context.tf b/live/common-infra/context.tf
index b412fa9..0221fb9 100644
--- a/live/common-infra/context.tf
+++ b/live/common-infra/context.tf
@@ -29,12 +29,6 @@ variable "tags" {
   default     = {}
 }
 
-locals {
-  tf_tags = {
-    ManagedBy = "terraform",
-  }
-}
-
 // Keep labels, tags consistent
 module "label" {
   source  = "cloudposse/label/null"
@@ -47,5 +41,5 @@ module "label" {
 
   delimiter   = "-"
   label_order = ["namespace", "environment", "stage", "name", "attributes"]
-  tags        = merge(var.tags, local.tf_tags)
+  tags        = var.tags
 }
diff --git a/live/common-infra/main.tf b/live/common-infra/main.tf
index 351767a..a3c8e80 100644
--- a/live/common-infra/main.tf
+++ b/live/common-infra/main.tf
@@ -2,8 +2,11 @@ provider "aws" {
   region = var.region
 
   default_tags {
-    tags = {
-      ManagedBy = "terraform"
-    }
+    tags = merge(module.label.tags, {
+      ManagedBy      = "terraform"
+      Owner          = "Software-Platforms"
+      Repository     = "https://github.com/Ionna-ev/terraform-infra"
+      RepositoryPath = "live/${path.module}"
+    })
   }
 }
diff --git a/live/core-networking/context.tf b/live/core-networking/context.tf
index b412fa9..0221fb9 100644
--- a/live/core-networking/context.tf
+++ b/live/core-networking/context.tf
@@ -29,12 +29,6 @@ variable "tags" {
   default     = {}
 }
 
-locals {
-  tf_tags = {
-    ManagedBy = "terraform",
-  }
-}
-
 // Keep labels, tags consistent
 module "label" {
   source  = "cloudposse/label/null"
@@ -47,5 +41,5 @@ module "label" {
 
   delimiter   = "-"
   label_order = ["namespace", "environment", "stage", "name", "attributes"]
-  tags        = merge(var.tags, local.tf_tags)
+  tags        = var.tags
 }
diff --git a/live/core-networking/main.tf b/live/core-networking/main.tf
index 351767a..a3c8e80 100644
--- a/live/core-networking/main.tf
+++ b/live/core-networking/main.tf
@@ -2,8 +2,11 @@ provider "aws" {
   region = var.region
 
   default_tags {
-    tags = {
-      ManagedBy = "terraform"
-    }
+    tags = merge(module.label.tags, {
+      ManagedBy      = "terraform"
+      Owner          = "Software-Platforms"
+      Repository     = "https://github.com/Ionna-ev/terraform-infra"
+      RepositoryPath = "live/${path.module}"
+    })
   }
 }
diff --git a/live/terraform-backend/context.tf b/live/terraform-backend/context.tf
index b412fa9..0221fb9 100644
--- a/live/terraform-backend/context.tf
+++ b/live/terraform-backend/context.tf
@@ -29,12 +29,6 @@ variable "tags" {
   default     = {}
 }
 
-locals {
-  tf_tags = {
-    ManagedBy = "terraform",
-  }
-}
-
 // Keep labels, tags consistent
 module "label" {
   source  = "cloudposse/label/null"
@@ -47,5 +41,5 @@ module "label" {
 
   delimiter   = "-"
   label_order = ["namespace", "environment", "stage", "name", "attributes"]
-  tags        = merge(var.tags, local.tf_tags)
+  tags        = var.tags
 }
diff --git a/live/terraform-backend/main.tf b/live/terraform-backend/main.tf
index 351767a..a3c8e80 100644
--- a/live/terraform-backend/main.tf
+++ b/live/terraform-backend/main.tf
@@ -2,8 +2,11 @@ provider "aws" {
   region = var.region
 
   default_tags {
-    tags = {
-      ManagedBy = "terraform"
-    }
+    tags = merge(module.label.tags, {
+      ManagedBy      = "terraform"
+      Owner          = "Software-Platforms"
+      Repository     = "https://github.com/Ionna-ev/terraform-infra"
+      RepositoryPath = "live/${path.module}"
+    })
   }
 }