diff --git a/templates/templates/component/terraform/fogg.tf.tmpl b/templates/templates/component/terraform/fogg.tf.tmpl
index 520343f54..cf815456b 100644
--- a/templates/templates/component/terraform/fogg.tf.tmpl
+++ b/templates/templates/component/terraform/fogg.tf.tmpl
@@ -123,11 +123,17 @@ variable "owner" {
 variable "tags" {
   type =  object({project: string, env: string, service: string, owner: string, managedBy: string})
   default = {
-    project   = "{{ .Project }}"
-    env       = "{{ .Env }}"
-    service   = "{{ .Name }}"
-    owner     = "{{ .Owner }}"
+    project       = "{{ .Project }}"
+    env           = "{{ .Env }}"
+    service       = "{{ .Name }}"
+    owner         = "{{ .Owner }}"
+    date          = "{{ .Date }}"
+    filePath      = "{{ .FilePath }}"
+    foggUser      = "{{ .FoggUser }}"
+    gitRepository = "{{ .GitRepository }}"
+    commitHash    = "{{ .CommitHash }}"
     managedBy = "terraform"
+
   }
 }