diff --git a/.github/autotagging.yml b/.github/autotagging.yml
new file mode 100644
index 0000000000..0a95ace988
--- /dev/null
+++ b/.github/autotagging.yml
@@ -0,0 +1,18 @@
+name: yor
+on:
+  - push
+  - pull_request
+
+jobs:
+  add-your-tags:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.7]
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Run yor action
+        uses: bridgecrewio/yor-action@main
diff --git a/.github/workflows/yortagging.yml b/.github/workflows/yortagging.yml
new file mode 100644
index 0000000000..0a95ace988
--- /dev/null
+++ b/.github/workflows/yortagging.yml
@@ -0,0 +1,18 @@
+name: yor
+on:
+  - push
+  - pull_request
+
+jobs:
+  add-your-tags:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.7]
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Run yor action
+        uses: bridgecrewio/yor-action@main
diff --git a/terraform/alicloud/bucket.tf b/terraform/alicloud/bucket.tf
index 831f9bc649..498355ef04 100644
--- a/terraform/alicloud/bucket.tf
+++ b/terraform/alicloud/bucket.tf
@@ -11,8 +11,9 @@ resource "alicloud_oss_bucket" "bad_bucket" {
     git_last_modified_at = "2022-04-05 15:17:55"
     git_last_modified_by = "james.woolfenden@gmail.com"
     git_modifiers        = "james.woolfenden"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "80373049-248d-4f5e-9d25-740c3e80f2b9"
+    yor_name             = "bad_bucket"
   }
 }
diff --git a/terraform/alicloud/rds.tf b/terraform/alicloud/rds.tf
index 70660df37e..7e2db00efc 100644
--- a/terraform/alicloud/rds.tf
+++ b/terraform/alicloud/rds.tf
@@ -23,8 +23,9 @@ resource "alicloud_db_instance" "seeme" {
     git_last_modified_at = "2022-04-05 15:14:28"
     git_last_modified_by = "james.woolfenden@gmail.com"
     git_modifiers        = "james.woolfenden"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "7bd1394e-0a79-4288-8f83-5abcca5bf1ba"
+    yor_name             = "seeme"
   }
 }
diff --git a/terraform/alicloud/trail.tf b/terraform/alicloud/trail.tf
index 9e2daf8c84..235a875f16 100644
--- a/terraform/alicloud/trail.tf
+++ b/terraform/alicloud/trail.tf
@@ -16,9 +16,10 @@ resource "alicloud_oss_bucket" "trail" {
     git_last_modified_at = "2022-04-05 15:14:28"
     git_last_modified_by = "james.woolfenden@gmail.com"
     git_modifiers        = "james.woolfenden"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "9ce7077b-8195-4e71-aec6-ed1f769555dc"
+    yor_name             = "trail"
   }
 }
 
diff --git a/terraform/aws/db-app.tf b/terraform/aws/db-app.tf
index f0157e086b..462cad41fc 100644
--- a/terraform/aws/db-app.tf
+++ b/terraform/aws/db-app.tf
@@ -24,14 +24,16 @@ resource "aws_db_instance" "default" {
     Name        = "${local.resource_prefix.value}-rds"
     Environment = local.resource_prefix.value
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/db-app.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "jonjozwiak/nimrodkor"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "47c13290-c2ce-48a7-b666-1b0085effb92"
+    }, {
+    yor_name = "default"
   })
 
   # Ignore password changes from tf plan diff
@@ -50,14 +52,16 @@ resource "aws_db_option_group" "default" {
     Name        = "${local.resource_prefix.value}-og"
     Environment = local.resource_prefix.value
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/db-app.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "jonjozwiak/nimrodkor"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "c8076043-5de7-4203-9a1c-b4e61900628a"
+    }, {
+    yor_name = "default"
   })
 }
 
@@ -82,14 +86,16 @@ resource "aws_db_parameter_group" "default" {
     Name        = "${local.resource_prefix.value}-pg"
     Environment = local.resource_prefix.value
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/db-app.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "jonjozwiak/nimrodkor"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "6432b3f9-3f45-4463-befc-2e0f2fbdffc1"
+    }, {
+    yor_name = "default"
   })
 }
 
@@ -102,14 +108,16 @@ resource "aws_db_subnet_group" "default" {
     Name        = "sg-${local.resource_prefix.value}"
     Environment = local.resource_prefix.value
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/db-app.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "jonjozwiak/nimrodkor"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "b8368249-50c5-4a24-bdb0-9f83d197b11c"
+    }, {
+    yor_name = "default"
   })
 }
 
@@ -121,14 +129,16 @@ resource "aws_security_group" "default" {
     Name        = "${local.resource_prefix.value}-rds-sg"
     Environment = local.resource_prefix.value
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/db-app.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "jonjozwiak/nimrodkor"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "7b251090-8ac1-4290-bd2e-bf3e16126430"
+    }, {
+    yor_name = "default"
   })
 }
 
@@ -156,14 +166,15 @@ resource "aws_iam_instance_profile" "ec2profile" {
   name = "${local.resource_prefix.value}-profile"
   role = "${aws_iam_role.ec2role.name}"
   tags = {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/db-app.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "jonathan.jozwiak/nimrodkor"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "6d33b2b9-2dd3-4915-b5d4-283152c928f1"
+    yor_name             = "ec2profile"
   }
 }
 
@@ -191,14 +202,16 @@ EOF
     Name        = "${local.resource_prefix.value}-role"
     Environment = local.resource_prefix.value
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/db-app.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "jonathan.jozwiak/nimrodkor"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "d4b631c1-c1d0-4986-affb-fb8b94a6a7a5"
+    }, {
+    yor_name = "ec2role"
   })
 }
 
@@ -400,14 +413,16 @@ EOF
   tags = merge({
     Name = "${local.resource_prefix.value}-dbapp"
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/db-app.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "jonathan.jozwiak/jonjozwiak/nimrodkor"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "f7999d4e-c983-43ee-bd88-7903a6f8483e"
+    }, {
+    yor_name = "db_app"
   })
 }
 
diff --git a/terraform/aws/ec2.tf b/terraform/aws/ec2.tf
index 00e0ba940f..c760397e70 100644
--- a/terraform/aws/ec2.tf
+++ b/terraform/aws/ec2.tf
@@ -12,7 +12,7 @@ sudo apt-get update
 sudo apt-get install -y apache2
 sudo systemctl start apache2
 sudo systemctl enable apache2
-export AWS_ACCESS_KEY_ID=AKIAIOSFODNN7EXAMAAA
+export AWS_ACCESS_KEY_ID=THISISAFAKEKEY
 export AWS_SECRET_ACCESS_KEY=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
 export AWS_DEFAULT_REGION=us-west-2
 echo "<h1>Deployed via Terraform</h1>" | sudo tee /var/www/html/index.html
@@ -20,33 +20,37 @@ EOF
   tags = merge({
     Name = "${local.resource_prefix.value}-ec2"
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "9dc36ce6a7ddf0094115b0f7cba904148a11a194"
     git_file             = "terraform/aws/ec2.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2022-12-27 05:06:54"
+    git_last_modified_by = "86843980+Juliandreslopez@users.noreply.github.com"
+    git_modifiers        = "86843980+Juliandreslopez/nimrodkor/schosterbarak"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "347af3cd-4f70-4632-aca3-4d5e30ffc0b6"
+    }, {
+    yor_name = "web_host"
   })
 }
 
 resource "aws_ebs_volume" "web_host_storage" {
   # unencrypted volume
   availability_zone = "${var.region}a"
-  #encrypted         = false  # Setting this causes the volume to be recreated on apply 
+  #encrypted         = true  # Setting this causes the volume to be recreated on apply 
   size = 1
   tags = merge({
     Name = "${local.resource_prefix.value}-ebs"
     }, {
-    git_commit           = "d3439f0f2af62f6fa3521e14d6c27819ef8f12e1"
+    git_commit           = "9dc36ce6a7ddf0094115b0f7cba904148a11a194"
     git_file             = "terraform/aws/ec2.tf"
-    git_last_modified_at = "2021-05-02 11:17:26"
-    git_last_modified_by = "nimrodkor@users.noreply.github.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2022-12-27 05:06:54"
+    git_last_modified_by = "86843980+Juliandreslopez@users.noreply.github.com"
+    git_modifiers        = "86843980+Juliandreslopez/nimrodkor/schosterbarak"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "c5509daf-10f0-46af-9e03-41989212521d"
+    }, {
+    yor_name = "web_host_storage"
   })
 }
 
@@ -57,14 +61,16 @@ resource "aws_ebs_snapshot" "example_snapshot" {
   tags = merge({
     Name = "${local.resource_prefix.value}-ebs-snapshot"
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/ec2.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "nimrodkor/schosterbarak"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "c1008080-ec2f-4512-a0d0-2e9330aa58f0"
+    }, {
+    yor_name = "example_snapshot"
   })
 }
 
@@ -103,14 +109,15 @@ resource "aws_security_group" "web-node" {
   }
   depends_on = [aws_vpc.web_vpc]
   tags = {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/ec2.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "jonjozwiak/nimrodkor/schosterbarak"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "b7af1b40-64eb-4519-a1a0-ab198db4b193"
+    yor_name             = "web-node"
   }
 }
 
@@ -121,14 +128,16 @@ resource "aws_vpc" "web_vpc" {
   tags = merge({
     Name = "${local.resource_prefix.value}-vpc"
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/ec2.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "jonjozwiak/nimrodkor/schosterbarak"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "9bf2359b-952e-4570-9595-52eba4c20473"
+    }, {
+    yor_name = "web_vpc"
   })
 }
 
@@ -149,6 +158,8 @@ resource "aws_subnet" "web_subnet" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "0345f650-d280-4ca8-86c9-c71c38c0eda8"
+    }, {
+    yor_name = "web_subnet"
   })
 }
 
@@ -169,6 +180,8 @@ resource "aws_subnet" "web_subnet2" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "224af03a-00e0-4981-be30-14965833c2db"
+    }, {
+    yor_name = "web_subnet2"
   })
 }
 
@@ -179,14 +192,16 @@ resource "aws_internet_gateway" "web_igw" {
   tags = merge({
     Name = "${local.resource_prefix.value}-igw"
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/ec2.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "jonjozwiak/nimrodkor"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "d8e63cb4-2fb5-4726-9c86-5fd05ef03674"
+    }, {
+    yor_name = "web_igw"
   })
 }
 
@@ -196,14 +211,16 @@ resource "aws_route_table" "web_rtb" {
   tags = merge({
     Name = "${local.resource_prefix.value}-rtb"
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/ec2.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "jonjozwiak/nimrodkor"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "5e4fee6e-a6aa-4b61-a741-47c5efb463e1"
+    }, {
+    yor_name = "web_rtb"
   })
 }
 
@@ -235,14 +252,16 @@ resource "aws_network_interface" "web-eni" {
   tags = merge({
     Name = "${local.resource_prefix.value}-primary_network_interface"
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/ec2.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "jonjozwiak/nimrodkor/schosterbarak"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "7e2ffea8-739f-467d-b57b-53cbc0d7ccbe"
+    }, {
+    yor_name = "web-eni"
   })
 }
 
@@ -257,14 +276,16 @@ resource "aws_flow_log" "vpcflowlogs" {
     Name        = "${local.resource_prefix.value}-flowlogs"
     Environment = local.resource_prefix.value
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/ec2.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "jonathan.jozwiak/nimrodkor"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "6808d4b7-45bc-4d1d-9523-96757a3add3a"
+    }, {
+    yor_name = "vpcflowlogs"
   })
 }
 
@@ -276,14 +297,16 @@ resource "aws_s3_bucket" "flowbucket" {
     Name        = "${local.resource_prefix.value}-flowlogs"
     Environment = local.resource_prefix.value
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/ec2.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "jonathan.jozwiak/nimrodkor"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "f058838a-b1e0-4383-b965-7e06e987ffb1"
+    }, {
+    yor_name = "flowbucket"
   })
 }
 
diff --git a/terraform/aws/ecr.tf b/terraform/aws/ecr.tf
index e578bac633..ad2e6c17d1 100644
--- a/terraform/aws/ecr.tf
+++ b/terraform/aws/ecr.tf
@@ -5,14 +5,16 @@ resource aws_ecr_repository "repository" {
   tags = merge({
     Name = "${local.resource_prefix.value}-repository"
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/ecr.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "nimrodkor/rotemavn"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "7a3ec657-fa54-4aa2-8467-5d08d6c90bc2"
+    }, {
+    yor_name = "repository"
   })
 }
 
diff --git a/terraform/aws/eks.tf b/terraform/aws/eks.tf
index 53707039d8..08ee6da8d1 100644
--- a/terraform/aws/eks.tf
+++ b/terraform/aws/eks.tf
@@ -19,14 +19,15 @@ resource aws_iam_role "iam_for_eks" {
   name               = "${local.resource_prefix.value}-iam-for-eks"
   assume_role_policy = data.aws_iam_policy_document.iam_policy_eks.json
   tags = {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/eks.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "elaygl/nimrodkor"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "de052596-21a0-43de-8153-469add277b18"
+    yor_name             = "iam_for_eks"
   }
 }
 
@@ -47,14 +48,16 @@ resource aws_vpc "eks_vpc" {
   tags = merge({
     Name = "${local.resource_prefix.value}-eks-vpc"
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/eks.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "elaygl/nimrodkor"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "1600ca6c-72f6-45c0-a71d-88e117e51d6b"
+    }, {
+    yor_name = "eks_vpc"
   })
 }
 
@@ -83,6 +86,8 @@ resource aws_subnet "eks_subnet1" {
     "kubernetes.io/cluster/$$$${local.eks_name.value}" = "shared"
     "kubernetes.io/cluster/$$${local.eks_name.value}"  = "shared"
     "kubernetes.io/cluster/$${local.eks_name.value}"   = "shared"
+    }, {
+    yor_name = "eks_subnet1"
   })
 }
 
@@ -111,6 +116,8 @@ resource aws_subnet "eks_subnet2" {
     "kubernetes.io/cluster/$$$${local.eks_name.value}" = "shared"
     "kubernetes.io/cluster/$$${local.eks_name.value}"  = "shared"
     "kubernetes.io/cluster/$${local.eks_name.value}"   = "shared"
+    }, {
+    yor_name = "eks_subnet2"
   })
 }
 
@@ -128,14 +135,15 @@ resource aws_eks_cluster "eks_cluster" {
     "aws_iam_role_policy_attachment.policy_attachment-AmazonEKSServicePolicy",
   ]
   tags = {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/eks.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "elaygl/nimrodkor"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "7fa14261-c18d-4fa2-aec4-746f6e64d2d3"
+    yor_name             = "eks_cluster"
   }
 }
 
diff --git a/terraform/aws/elb.tf b/terraform/aws/elb.tf
index 7327513b3d..36af43bcd6 100644
--- a/terraform/aws/elb.tf
+++ b/terraform/aws/elb.tf
@@ -28,13 +28,15 @@ resource "aws_elb" "weblb" {
   tags = merge({
     Name = "foobar-terraform-elb"
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/elb.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "nimrodkor/orshapira"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "b4a83ce9-9a45-43b4-b6d9-1783c282f702"
+    }, {
+    yor_name = "weblb"
   })
 }
\ No newline at end of file
diff --git a/terraform/aws/es.tf b/terraform/aws/es.tf
index 43e15ea044..35e564fd2a 100644
--- a/terraform/aws/es.tf
+++ b/terraform/aws/es.tf
@@ -15,14 +15,15 @@ resource "aws_elasticsearch_domain" "monitoring-framework" {
     volume_size = 30
   }
   tags = {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/es.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "guetaaviv/nimrodkor"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "95131dec-d7c9-49bb-9aff-eb0e2736603b"
+    yor_name             = "monitoring-framework"
   }
 }
 
diff --git a/terraform/aws/iam.tf b/terraform/aws/iam.tf
index 03d9360ccc..06eb6345de 100644
--- a/terraform/aws/iam.tf
+++ b/terraform/aws/iam.tf
@@ -6,14 +6,16 @@ resource "aws_iam_user" "user" {
     Name        = "${local.resource_prefix.value}-user"
     Environment = local.resource_prefix.value
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/iam.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "jonathan.jozwiak/nimrodkor"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "9b45b298-c1ea-426a-9644-610780021eaa"
+    }, {
+    yor_name = "user"
   })
 
 }
diff --git a/terraform/aws/kms.tf b/terraform/aws/kms.tf
index 8f27b4f6c1..ff50b8c9f4 100644
--- a/terraform/aws/kms.tf
+++ b/terraform/aws/kms.tf
@@ -4,14 +4,15 @@ resource "aws_kms_key" "logs_key" {
 
   deletion_window_in_days = 7
   tags = {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/kms.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "nimrodkor/schosterbarak"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "cd8fa2a7-4868-4cd1-993d-da4644808ce5"
+    yor_name             = "logs_key"
   }
 }
 
diff --git a/terraform/aws/lambda.tf b/terraform/aws/lambda.tf
index 1e9237dc44..78404ad89a 100644
--- a/terraform/aws/lambda.tf
+++ b/terraform/aws/lambda.tf
@@ -17,14 +17,15 @@ resource "aws_iam_role" "iam_for_lambda" {
 }
 EOF
   tags = {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/lambda.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "nimrodkor/schosterbarak"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "93cfa6f9-a257-40c3-b7dc-3c3686929734"
+    yor_name             = "iam_for_lambda"
   }
 }
 
@@ -54,5 +55,6 @@ resource "aws_lambda_function" "analysis_lambda" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "f7d8bc47-e5d9-4b09-9d8f-e7b9724d826e"
+    yor_name             = "analysis_lambda"
   }
 }
\ No newline at end of file
diff --git a/terraform/aws/neptune.tf b/terraform/aws/neptune.tf
index 7dd4a0d138..25854b9851 100644
--- a/terraform/aws/neptune.tf
+++ b/terraform/aws/neptune.tf
@@ -8,14 +8,15 @@ resource "aws_neptune_cluster" "default" {
   apply_immediately                   = true
   storage_encrypted                   = false
   tags = {
-    git_commit           = "aa8fd16fd94cccf6af206e2f0922b5558f8ac514"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/neptune.tf"
-    git_last_modified_at = "2020-08-21 19:14:35"
-    git_last_modified_by = "matt@bridgecrew.io"
-    git_modifiers        = "matt"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "matt/nimrodkor"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "0d4cbb85-73ed-4ca0-b1da-296e4185f34e"
+    yor_name             = "default"
   }
 }
 
@@ -35,6 +36,7 @@ resource "aws_neptune_cluster_instance" "default" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "9b2b45fd-6f9f-44fd-b8bc-868b1db178b3"
+    yor_name             = "default"
   }
 }
 
diff --git a/terraform/aws/rds.tf b/terraform/aws/rds.tf
index b9d5b5aebe..51102aa959 100644
--- a/terraform/aws/rds.tf
+++ b/terraform/aws/rds.tf
@@ -8,9 +8,10 @@ resource "aws_rds_cluster" "app1-rds-cluster" {
     git_last_modified_at = "2021-12-08 23:26:32"
     git_last_modified_by = "tron47@gmail.com"
     git_modifiers        = "tron47"
-    git_org              = "matansha"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "b6f2c2ec-0715-46a0-83d4-502e588826d1"
+    yor_name             = "app1-rds-cluster"
   }
 }
 
@@ -24,9 +25,10 @@ resource "aws_rds_cluster" "app2-rds-cluster" {
     git_last_modified_at = "2021-12-08 23:26:32"
     git_last_modified_by = "tron47@gmail.com"
     git_modifiers        = "tron47"
-    git_org              = "matansha"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "d33c9292-952b-4c1f-9973-b6dbad519461"
+    yor_name             = "app2-rds-cluster"
   }
 }
 
@@ -40,9 +42,10 @@ resource "aws_rds_cluster" "app3-rds-cluster" {
     git_last_modified_at = "2021-12-08 23:26:32"
     git_last_modified_by = "tron47@gmail.com"
     git_modifiers        = "tron47"
-    git_org              = "matansha"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "2a8584b1-7e9d-4739-8e37-366620c92027"
+    yor_name             = "app3-rds-cluster"
   }
 }
 
@@ -56,9 +59,10 @@ resource "aws_rds_cluster" "app4-rds-cluster" {
     git_last_modified_at = "2021-12-08 23:26:32"
     git_last_modified_by = "tron47@gmail.com"
     git_modifiers        = "tron47"
-    git_org              = "matansha"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "284aaeed-fd3f-4b7a-b5f8-61a8457f4d83"
+    yor_name             = "app4-rds-cluster"
   }
 }
 
@@ -72,9 +76,10 @@ resource "aws_rds_cluster" "app5-rds-cluster" {
     git_last_modified_at = "2021-12-08 23:26:32"
     git_last_modified_by = "tron47@gmail.com"
     git_modifiers        = "tron47"
-    git_org              = "matansha"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "0b2bea23-5ca5-4bd1-956e-b9ed978daadf"
+    yor_name             = "app5-rds-cluster"
   }
 }
 
@@ -88,9 +93,10 @@ resource "aws_rds_cluster" "app6-rds-cluster" {
     git_last_modified_at = "2021-12-08 23:26:32"
     git_last_modified_by = "tron47@gmail.com"
     git_modifiers        = "tron47"
-    git_org              = "matansha"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "fcffb961-d859-4be5-997f-d51b50665ada"
+    yor_name             = "app6-rds-cluster"
   }
 }
 
@@ -104,9 +110,10 @@ resource "aws_rds_cluster" "app7-rds-cluster" {
     git_last_modified_at = "2021-12-08 23:26:32"
     git_last_modified_by = "tron47@gmail.com"
     git_modifiers        = "tron47"
-    git_org              = "matansha"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "ebc2ac20-23a3-4518-a7ef-3a102b003ab6"
+    yor_name             = "app7-rds-cluster"
   }
 }
 
@@ -124,6 +131,7 @@ resource "aws_rds_cluster" "app8-rds-cluster" {
     git_repo             = "terragoat"
     yor_trace            = "af643747-0967-4251-8645-3b54882c2507"
 
+    yor_name = "app8-rds-cluster"
   }
 }
 
@@ -137,8 +145,9 @@ resource "aws_rds_cluster" "app9-rds-cluster" {
     git_last_modified_at = "2021-12-08 23:26:32"
     git_last_modified_by = "tron47@gmail.com"
     git_modifiers        = "tron47"
-    git_org              = "matansha"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "a0c98536-c751-4743-92f1-a106ce750249"
+    yor_name             = "app9-rds-cluster"
   }
 }
diff --git a/terraform/aws/s3.tf b/terraform/aws/s3.tf
index a2a2ed78fe..a4e2749db6 100644
--- a/terraform/aws/s3.tf
+++ b/terraform/aws/s3.tf
@@ -9,14 +9,16 @@ resource "aws_s3_bucket" "data" {
     Name        = "${local.resource_prefix.value}-data"
     Environment = local.resource_prefix.value
     }, {
-    git_commit           = "4d57f83ca4d3a78a44fb36d1dcf0d23983fa44f5"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/s3.tf"
-    git_last_modified_at = "2022-05-18 07:08:06"
-    git_last_modified_by = "nimrod@bridgecrew.io"
-    git_modifiers        = "34870196+LironElbaz/nimrod/nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "jonjozwiak/nimrodkor/schosterbarak"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "0874007d-903a-4b4c-945f-c9c233e13243"
+    }, {
+    yor_name = "data"
   })
 }
 
@@ -28,14 +30,16 @@ resource "aws_s3_bucket_object" "data_object" {
     Name        = "${local.resource_prefix.value}-customer-master"
     Environment = local.resource_prefix.value
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/s3.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "jonjozwiak/nimrodkor"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "a7f01cc7-63c2-41a8-8555-6665e5e39a64"
+    }, {
+    yor_name = "data_object"
   })
 }
 
@@ -50,14 +54,16 @@ resource "aws_s3_bucket" "financials" {
     Name        = "${local.resource_prefix.value}-financials"
     Environment = local.resource_prefix.value
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/s3.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "jonjozwiak/nimrodkor/schosterbarak"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "0e012640-b597-4e5d-9378-d4b584aea913"
+    }, {
+    yor_name = "financials"
   })
 
 }
@@ -75,14 +81,16 @@ resource "aws_s3_bucket" "operations" {
     Name        = "${local.resource_prefix.value}-operations"
     Environment = local.resource_prefix.value
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/s3.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "jonjozwiak/nimrodkor/schosterbarak"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "29efcf7b-22a8-4bd6-8e14-1f55b3a2d743"
+    }, {
+    yor_name = "operations"
   })
 }
 
@@ -99,14 +107,15 @@ resource "aws_s3_bucket" "data_science" {
   }
   force_destroy = true
   tags = {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/s3.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "nimrodkor/schosterbarak"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "9a7c8788-5655-4708-bbc3-64ead9847f64"
+    yor_name             = "data_science"
   }
 }
 
@@ -129,13 +138,15 @@ resource "aws_s3_bucket" "logs" {
     Name        = "${local.resource_prefix.value}-logs"
     Environment = local.resource_prefix.value
     }, {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/aws/s3.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
-    git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "jonjozwiak/nimrodkor/schosterbarak"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "01946fe9-aae2-4c99-a975-e9b0d3a4696c"
+    }, {
+    yor_name = "logs"
   })
 }
diff --git a/terraform/azure/aks.tf b/terraform/azure/aks.tf
index ebb613bdf0..d0555e9ea7 100644
--- a/terraform/azure/aks.tf
+++ b/terraform/azure/aks.tf
@@ -23,13 +23,14 @@ resource azurerm_kubernetes_cluster "k8s_cluster" {
     enabled = false
   }
   tags = {
-    git_commit           = "898d5beaec7ffdef6df0d7abecff407362e2a74e"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/azure/aks.tf"
-    git_last_modified_at = "2020-06-17 12:59:55"
-    git_last_modified_by = "nimrodkor@gmail.com"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
     git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "6103d111-864e-42e5-899c-1864de281fd1"
+    yor_name             = "k8s_cluster"
   }
 }
\ No newline at end of file
diff --git a/terraform/azure/app_service.tf b/terraform/azure/app_service.tf
index fa4f23edff..39872e6d82 100644
--- a/terraform/azure/app_service.tf
+++ b/terraform/azure/app_service.tf
@@ -8,14 +8,15 @@ resource azurerm_app_service_plan "example" {
     size = "S1"
   }
   tags = {
-    git_commit           = "898d5beaec7ffdef6df0d7abecff407362e2a74e"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/azure/app_service.tf"
-    git_last_modified_at = "2020-06-17 12:59:55"
-    git_last_modified_by = "nimrodkor@gmail.com"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
     git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "6611bf45-fd5b-467e-b119-d533cd7539b8"
+    yor_name             = "example"
   }
 }
 
@@ -29,14 +30,15 @@ resource azurerm_app_service "app-service1" {
     min_tls_version = "1.1"
   }
   tags = {
-    git_commit           = "81738b80d571fa3034633690d13ffb460e1e7dea"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/azure/app_service.tf"
-    git_last_modified_at = "2020-06-19 21:14:50"
-    git_last_modified_by = "Adin.Ermie@outlook.com"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
     git_modifiers        = "Adin.Ermie/nimrodkor"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "13be096d-c599-46e5-bf54-51c6e9732858"
+    yor_name             = "app-service1"
   }
 }
 
@@ -59,6 +61,7 @@ resource azurerm_app_service "app-service2" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "ec8295ab-af68-4cff-b0f1-b0cf5eaf1b75"
+    yor_name             = "app-service2"
   }
 }
 
diff --git a/terraform/azure/application_gateway.tf b/terraform/azure/application_gateway.tf
index e66945b83a..d81f071a15 100644
--- a/terraform/azure/application_gateway.tf
+++ b/terraform/azure/application_gateway.tf
@@ -62,5 +62,6 @@ resource "azurerm_application_gateway" "network" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "3f62753b-3d20-4fa7-b402-b780234a14d8"
+    yor_name             = "network"
   }
 }
diff --git a/terraform/azure/instance.tf b/terraform/azure/instance.tf
index 225872bab1..175ccca4a1 100644
--- a/terraform/azure/instance.tf
+++ b/terraform/azure/instance.tf
@@ -30,14 +30,16 @@ resource azurerm_linux_virtual_machine "linux_machine" {
     terragoat   = true
     environment = var.environment
     }, {
-    git_commit           = "de3bb777f967989c2c3332faea16cb614c55ccc9"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/azure/instance.tf"
-    git_last_modified_at = "2020-06-17 15:48:15"
-    git_last_modified_by = "nimrodkor@gmail.com"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
     git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "736ef713-51b8-4178-ad69-406be81f6ef2"
+    }, {
+    yor_name = "linux_machine"
   })
 }
 
@@ -65,13 +67,15 @@ resource azurerm_windows_virtual_machine "windows_machine" {
     terragoat   = true
     environment = var.environment
     }, {
-    git_commit           = "de3bb777f967989c2c3332faea16cb614c55ccc9"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/azure/instance.tf"
-    git_last_modified_at = "2020-06-17 15:48:15"
-    git_last_modified_by = "nimrodkor@gmail.com"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
     git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "41938587-bdfc-4234-b941-560f1ae7d6c0"
+    }, {
+    yor_name = "windows_machine"
   })
-}
\ No newline at end of file
+}
diff --git a/terraform/azure/key_vault.tf b/terraform/azure/key_vault.tf
index 7f2be4a6d7..3ff6b10e93 100644
--- a/terraform/azure/key_vault.tf
+++ b/terraform/azure/key_vault.tf
@@ -19,14 +19,16 @@ resource "azurerm_key_vault" "example" {
     environment = var.environment
     terragoat   = true
     }, {
-    git_commit           = "81738b80d571fa3034633690d13ffb460e1e7dea"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/azure/key_vault.tf"
-    git_last_modified_at = "2020-06-19 21:14:50"
-    git_last_modified_by = "Adin.Ermie@outlook.com"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
     git_modifiers        = "Adin.Ermie/nimrodkor"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "79afeacc-248a-4015-a4fa-76a6a57f06e2"
+    }, {
+    yor_name = "example"
   })
 }
 
@@ -44,14 +46,15 @@ resource "azurerm_key_vault_key" "generated" {
     "wrapKey",
   ]
   tags = {
-    git_commit           = "898d5beaec7ffdef6df0d7abecff407362e2a74e"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/azure/key_vault.tf"
-    git_last_modified_at = "2020-06-17 12:59:55"
-    git_last_modified_by = "nimrodkor@gmail.com"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
     git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "afbc6e13-63d9-4e6c-8914-d58b7744b5dd"
+    yor_name             = "generated"
   }
 }
 
@@ -60,13 +63,14 @@ resource "azurerm_key_vault_secret" "secret" {
   name         = "terragoat-secret-${var.environment}"
   value        = random_string.password.result
   tags = {
-    git_commit           = "f8ff847bb69370bbe03b3d2b70db586ff6c867fc"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/azure/key_vault.tf"
-    git_last_modified_at = "2020-06-19 21:16:08"
-    git_last_modified_by = "Adin.Ermie@outlook.com"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
     git_modifiers        = "Adin.Ermie/nimrodkor"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "40517524-f05d-485b-bfbe-3fa0dbee511e"
+    yor_name             = "secret"
   }
 }
\ No newline at end of file
diff --git a/terraform/azure/mssql.tf b/terraform/azure/mssql.tf
index 1c7f1f9ff4..3cb8a877c5 100644
--- a/terraform/azure/mssql.tf
+++ b/terraform/azure/mssql.tf
@@ -11,9 +11,10 @@ resource "azurerm_storage_account" "security_storage_account" {
     git_last_modified_at = "2022-01-20 05:32:41"
     git_last_modified_by = "28880387+tsmithv11@users.noreply.github.com"
     git_modifiers        = "28880387+tsmithv11"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "4b504d4d-608c-45fe-ae56-807bde6d969f"
+    yor_name             = "security_storage_account"
   }
 }
 
@@ -30,9 +31,10 @@ resource "azurerm_mssql_server" "mssql1" {
     git_last_modified_at = "2022-01-20 18:41:19"
     git_last_modified_by = "28880387+tsmithv11@users.noreply.github.com"
     git_modifiers        = "28880387+tsmithv11"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "54f6cb23-b30a-4f1d-8064-6f777b9b75db"
+    yor_name             = "mssql1"
   }
 }
 
@@ -49,9 +51,10 @@ resource "azurerm_mssql_server" "mssql2" {
     git_last_modified_at = "2022-01-20 18:41:19"
     git_last_modified_by = "28880387+tsmithv11@users.noreply.github.com"
     git_modifiers        = "28880387+tsmithv11"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "096d2cf2-6d47-41b2-9418-cdedea85e184"
+    yor_name             = "mssql2"
   }
 }
 
@@ -68,9 +71,10 @@ resource "azurerm_mssql_server" "mssql3" {
     git_last_modified_at = "2022-01-20 18:41:19"
     git_last_modified_by = "28880387+tsmithv11@users.noreply.github.com"
     git_modifiers        = "28880387+tsmithv11"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "e71d3fb5-addc-481d-ada6-b7432a768de3"
+    yor_name             = "mssql3"
   }
 }
 
@@ -87,9 +91,10 @@ resource "azurerm_mssql_server" "mssql4" {
     git_last_modified_at = "2022-01-20 18:41:19"
     git_last_modified_by = "28880387+tsmithv11@users.noreply.github.com"
     git_modifiers        = "28880387+tsmithv11"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "c3b85724-4f7e-4c63-a17d-3d04239beae8"
+    yor_name             = "mssql4"
   }
 }
 
@@ -106,9 +111,10 @@ resource "azurerm_mssql_server" "mssql5" {
     git_last_modified_at = "2022-01-20 18:41:19"
     git_last_modified_by = "28880387+tsmithv11@users.noreply.github.com"
     git_modifiers        = "28880387+tsmithv11"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "0240ca84-acc9-47d9-b491-9e7e359787a1"
+    yor_name             = "mssql5"
   }
 }
 
@@ -125,9 +131,10 @@ resource "azurerm_mssql_server" "mssql6" {
     git_last_modified_at = "2022-01-20 18:41:19"
     git_last_modified_by = "28880387+tsmithv11@users.noreply.github.com"
     git_modifiers        = "28880387+tsmithv11"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "042d15fb-edfa-484b-b65e-3d70c50cdee7"
+    yor_name             = "mssql6"
   }
 }
 
@@ -144,9 +151,10 @@ resource "azurerm_mssql_server" "mssql7" {
     git_last_modified_at = "2022-01-20 18:41:19"
     git_last_modified_by = "28880387+tsmithv11@users.noreply.github.com"
     git_modifiers        = "28880387+tsmithv11"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "3f1118e1-5067-452e-906f-5123cfc93711"
+    yor_name             = "mssql7"
   }
 }
 
diff --git a/terraform/azure/networking.tf b/terraform/azure/networking.tf
index ab01c60d07..c219f90012 100644
--- a/terraform/azure/networking.tf
+++ b/terraform/azure/networking.tf
@@ -4,14 +4,15 @@ resource "azurerm_virtual_network" "example" {
   location            = azurerm_resource_group.example.location
   resource_group_name = azurerm_resource_group.example.name
   tags = {
-    git_commit           = "898d5beaec7ffdef6df0d7abecff407362e2a74e"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/azure/networking.tf"
-    git_last_modified_at = "2020-06-17 12:59:55"
-    git_last_modified_by = "nimrodkor@gmail.com"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
     git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "eb19f165-9c21-4a7a-96e5-5bb557a38228"
+    yor_name             = "example"
   }
 }
 
@@ -33,14 +34,15 @@ resource "azurerm_network_interface" "ni_linux" {
     private_ip_address_allocation = "Dynamic"
   }
   tags = {
-    git_commit           = "de3bb777f967989c2c3332faea16cb614c55ccc9"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/azure/networking.tf"
-    git_last_modified_at = "2020-06-17 15:48:15"
-    git_last_modified_by = "nimrodkor@gmail.com"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
     git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "2647f099-dff8-4514-8cef-96159380c02a"
+    yor_name             = "ni_linux"
   }
 }
 
@@ -55,14 +57,15 @@ resource "azurerm_network_interface" "ni_win" {
     private_ip_address_allocation = "Dynamic"
   }
   tags = {
-    git_commit           = "de3bb777f967989c2c3332faea16cb614c55ccc9"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/azure/networking.tf"
-    git_last_modified_at = "2020-06-17 15:48:15"
-    git_last_modified_by = "nimrodkor@gmail.com"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
     git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "2b5dbf28-04fb-4151-a637-a731bbe7ed1d"
+    yor_name             = "ni_win"
   }
 }
 
@@ -103,6 +106,7 @@ resource azurerm_network_security_group "bad_sg" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "1a591ba4-d969-4572-9704-87b5c55c0ba3"
+    yor_name             = "bad_sg"
   }
 }
 
@@ -111,14 +115,15 @@ resource azurerm_network_watcher "network_watcher" {
   name                = "terragoat-network-watcher-${var.environment}"
   resource_group_name = azurerm_resource_group.example.name
   tags = {
-    git_commit           = "898d5beaec7ffdef6df0d7abecff407362e2a74e"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/azure/networking.tf"
-    git_last_modified_at = "2020-06-17 12:59:55"
-    git_last_modified_by = "nimrodkor@gmail.com"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
     git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "3da368fc-723f-43d2-8e82-08dcc91e5094"
+    yor_name             = "network_watcher"
   }
 }
 
@@ -138,8 +143,9 @@ resource azurerm_network_watcher_flow_log "flow_log" {
     git_last_modified_at = "2020-06-17 12:59:55"
     git_last_modified_by = "nimrodkor@gmail.com"
     git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "33a7212e-7f1a-49fc-af73-8e525c5546ec"
+    yor_name             = "flow_log"
   }
 }
\ No newline at end of file
diff --git a/terraform/azure/resource_group.tf b/terraform/azure/resource_group.tf
index cb7ab25f4c..51a1bd5f0c 100644
--- a/terraform/azure/resource_group.tf
+++ b/terraform/azure/resource_group.tf
@@ -2,13 +2,14 @@ resource "azurerm_resource_group" "example" {
   name     = "terragoat-${var.environment}"
   location = var.location
   tags = {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/azure/resource_group.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
     git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "80b3b0ca-e0d8-4266-8a1f-12c71afd7e18"
+    yor_name             = "example"
   }
 }
\ No newline at end of file
diff --git a/terraform/azure/sql.tf b/terraform/azure/sql.tf
index c466020b92..57a4000ed0 100644
--- a/terraform/azure/sql.tf
+++ b/terraform/azure/sql.tf
@@ -17,14 +17,16 @@ resource "azurerm_sql_server" "example" {
     environment = var.environment
     terragoat   = "true"
     }, {
-    git_commit           = "81738b80d571fa3034633690d13ffb460e1e7dea"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/azure/sql.tf"
-    git_last_modified_at = "2020-06-19 21:14:50"
-    git_last_modified_by = "Adin.Ermie@outlook.com"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
     git_modifiers        = "Adin.Ermie/nimrodkor"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "e5ec3432-e61f-4244-b59e-9ecc24ddd4cb"
+    }, {
+    yor_name = "example"
   })
 }
 
@@ -59,14 +61,15 @@ resource "azurerm_mysql_server" "example" {
   public_network_access_enabled     = true
   ssl_enforcement_enabled           = false
   tags = {
-    git_commit           = "81738b80d571fa3034633690d13ffb460e1e7dea"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/azure/sql.tf"
-    git_last_modified_at = "2020-06-19 21:14:50"
-    git_last_modified_by = "Adin.Ermie@outlook.com"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
     git_modifiers        = "Adin.Ermie/nimrodkor"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "1ac18c16-09a4-41c9-9a66-6f514050178e"
+    yor_name             = "example"
   }
 }
 
@@ -84,14 +87,15 @@ resource "azurerm_postgresql_server" "example" {
   version                      = "9.5"
   ssl_enforcement_enabled      = false
   tags = {
-    git_commit           = "81738b80d571fa3034633690d13ffb460e1e7dea"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/azure/sql.tf"
-    git_last_modified_at = "2020-06-19 21:14:50"
-    git_last_modified_by = "Adin.Ermie@outlook.com"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
     git_modifiers        = "Adin.Ermie/nimrodkor"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "9eae126d-9404-4511-9c32-2243457df459"
+    yor_name             = "example"
   }
 }
 
diff --git a/terraform/azure/storage.tf b/terraform/azure/storage.tf
index 8d6886286d..a67673ecb4 100644
--- a/terraform/azure/storage.tf
+++ b/terraform/azure/storage.tf
@@ -9,14 +9,15 @@ resource "azurerm_managed_disk" "example" {
     enabled = false
   }
   tags = {
-    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
     git_file             = "terraform/azure/storage.tf"
-    git_last_modified_at = "2020-06-16 14:46:24"
-    git_last_modified_by = "nimrodkor@gmail.com"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
     git_modifiers        = "nimrodkor"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "d17da7b3-f1c5-4723-9f77-d1b9069459c7"
+    yor_name             = "example"
   }
 }
 
@@ -56,6 +57,7 @@ resource "azurerm_storage_account" "example" {
     git_org              = "bridgecrewio"
     git_repo             = "terragoat"
     yor_trace            = "23861ff4-c42d-495e-80ac-776c74035f43"
+    yor_name             = "example"
   }
 }
 
diff --git a/terraform/gcp/big_data.tf b/terraform/gcp/big_data.tf
index 6ac3b07b2e..33368e718f 100644
--- a/terraform/gcp/big_data.tf
+++ b/terraform/gcp/big_data.tf
@@ -30,8 +30,9 @@ resource "google_bigquery_dataset" "dataset" {
     git_last_modified_at = "2022-01-19-17-02-27"
     git_last_modified_by = "jameswoolfenden"
     git_modifiers        = "jameswoolfenden__nimrodkor"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "2560d883-bc3a-4cb6-b9fc-fb666edf626e"
+    yor_name             = "dataset"
   }
 }
\ No newline at end of file
diff --git a/terraform/gcp/gcs.tf b/terraform/gcp/gcs.tf
index cd6dbac2a8..7d679f412d 100644
--- a/terraform/gcp/gcs.tf
+++ b/terraform/gcp/gcs.tf
@@ -8,9 +8,10 @@ resource "google_storage_bucket" "terragoat_website" {
     git_last_modified_at = "2022-01-19-17-02-27"
     git_last_modified_by = "jameswoolfenden"
     git_modifiers        = "jameswoolfenden__nimrodkor"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "bd00cd2e-f53f-4daf-8d4d-74c47846c1cc"
+    yor_name             = "terragoat_website"
   }
 }
 
diff --git a/terraform/gcp/instances.tf b/terraform/gcp/instances.tf
index a1b035dd63..177b82772c 100644
--- a/terraform/gcp/instances.tf
+++ b/terraform/gcp/instances.tf
@@ -27,9 +27,10 @@ resource "google_compute_instance" "server" {
     git_last_modified_at = "2022-01-19-17-02-27"
     git_last_modified_by = "jameswoolfenden"
     git_modifiers        = "jameswoolfenden__nimrodkor"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "cd562b76-fbce-4e60-8c75-c9f43d7ffc16"
+    yor_name             = "server"
   }
 }
 
@@ -41,8 +42,9 @@ resource "google_compute_disk" "unencrypted_disk" {
     git_last_modified_at = "2022-01-19-17-02-27"
     git_last_modified_by = "jameswoolfenden"
     git_modifiers        = "jameswoolfenden__nimrodkor"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "bf87b7d7-a9d8-4f03-a0d4-8a4cbb647d03"
+    yor_name             = "unencrypted_disk"
   }
 }
\ No newline at end of file
diff --git a/terraform/oracle/bucket.tf b/terraform/oracle/bucket.tf
index bbc89dd6b8..1986154c9a 100644
--- a/terraform/oracle/bucket.tf
+++ b/terraform/oracle/bucket.tf
@@ -16,9 +16,10 @@ resource "oci_objectstorage_bucket" "secretsquirrel" {
     git_last_modified_at = "2022-04-06 10:43:57"
     git_last_modified_by = "james.woolfenden@gmail.com"
     git_modifiers        = "james.woolfenden"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "a854aa89-5141-4518-a5dc-0ffe3075f209"
+    yor_name             = "secretsquirrel"
   }
 }
 
diff --git a/terraform/oracle/compartment.tf b/terraform/oracle/compartment.tf
index 2259c44956..2a7c49fe5e 100644
--- a/terraform/oracle/compartment.tf
+++ b/terraform/oracle/compartment.tf
@@ -9,8 +9,9 @@ resource "oci_identity_compartment" "tf-compartment" {
     git_last_modified_at = "2022-04-06 15:27:36"
     git_last_modified_by = "james.woolfenden@gmail.com"
     git_modifiers        = "james.woolfenden"
-    git_org              = "bridgecrewio"
+    git_org              = "Juliandreslopez"
     git_repo             = "terragoat"
     yor_trace            = "20f6ad13-d679-4c7a-8d1b-befdd7f16b97"
+    yor_name             = "tf-compartment"
   }
 }
\ No newline at end of file