diff --git a/scenarios/cicd/terraform/apigateway.tf b/scenarios/cicd/terraform/apigateway.tf
index 71908b92..b9db20fc 100644
--- a/scenarios/cicd/terraform/apigateway.tf
+++ b/scenarios/cicd/terraform/apigateway.tf
@@ -1,6 +1,11 @@
 resource "aws_apigatewayv2_api" "apigw" {
   name          = local.api_gateway_name
   protocol_type = "HTTP"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 resource "aws_apigatewayv2_integration" "lambda" {
@@ -39,4 +44,9 @@ resource "aws_apigatewayv2_stage" "prod" {
   api_id        = aws_apigatewayv2_api.apigw.id
   deployment_id = aws_apigatewayv2_deployment.example.id
   name          = "prod"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
\ No newline at end of file
diff --git a/scenarios/cicd/terraform/codebuild_build.tf b/scenarios/cicd/terraform/codebuild_build.tf
index 5d3d2407..dfe93601 100644
--- a/scenarios/cicd/terraform/codebuild_build.tf
+++ b/scenarios/cicd/terraform/codebuild_build.tf
@@ -22,6 +22,11 @@ resource "aws_codebuild_project" "build-docker-image" {
     type     = "CODECOMMIT"
     location = aws_codecommit_repository.code.clone_url_http
   }
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 
@@ -42,6 +47,11 @@ resource "aws_iam_role" "build-docker-image" {
   ]
 }
 EOF
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 resource "aws_iam_role_policy" "build-docker-image" {
diff --git a/scenarios/cicd/terraform/codebuild_deploy.tf b/scenarios/cicd/terraform/codebuild_deploy.tf
index 3885e5cc..35eb30b4 100644
--- a/scenarios/cicd/terraform/codebuild_deploy.tf
+++ b/scenarios/cicd/terraform/codebuild_deploy.tf
@@ -27,6 +27,11 @@ resource "aws_codebuild_project" "deploy-lambda" {
     type      = "NO_SOURCE"
     buildspec = file("${path.module}/../assets/cd-pipeline/buildspec.yml")
   }
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 
@@ -47,6 +52,11 @@ resource "aws_iam_role" "deploy-lambda" {
   ]
 }
 EOF
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 resource "aws_iam_role_policy" "deploy-lambda" {
diff --git a/scenarios/cicd/terraform/codepipeline.tf b/scenarios/cicd/terraform/codepipeline.tf
index eb64eef8..01a4a642 100644
--- a/scenarios/cicd/terraform/codepipeline.tf
+++ b/scenarios/cicd/terraform/codepipeline.tf
@@ -7,8 +7,13 @@ locals {
 
 resource "aws_s3_bucket" "codepipeline_bucket" {
   bucket        = "codepipeline-bucket-${local.bucket_suffix}"
-  acl           = "private" 
+  acl           = "private"
   force_destroy = true
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 resource "aws_iam_role" "codepipeline" {
@@ -28,6 +33,11 @@ resource "aws_iam_role" "codepipeline" {
   ]
 }
 EOF
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 resource "aws_iam_role_policy" "codepipeline" {
@@ -138,4 +148,9 @@ resource "aws_codepipeline" "codepipeline" {
       }
     }
   }
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
\ No newline at end of file
diff --git a/scenarios/cicd/terraform/dev_machine.tf b/scenarios/cicd/terraform/dev_machine.tf
index 16fc88ee..2fce86a5 100644
--- a/scenarios/cicd/terraform/dev_machine.tf
+++ b/scenarios/cicd/terraform/dev_machine.tf
@@ -16,6 +16,11 @@ data "aws_ami" "ubuntu" {
 resource "aws_network_interface" "dev" {
   subnet_id   = module.vpc.private_subnets[0]
   private_ips = ["10.0.1.10"]
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 resource "aws_iam_role" "dev-instance" {
   name = "dev-instance-role"
@@ -36,6 +41,11 @@ resource "aws_iam_role" "dev-instance" {
     ]
 }
 EOF
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 resource "aws_iam_role_policy_attachment" "dev-instance-policy" {
   role       = aws_iam_role.dev-instance.name
@@ -44,6 +54,11 @@ resource "aws_iam_role_policy_attachment" "dev-instance-policy" {
 resource "aws_iam_instance_profile" "dev" {
   name = "dev-instance-profile"
   role = aws_iam_role.dev-instance.name
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 resource "tls_private_key" "ssh_key" {
   algorithm = "RSA"
@@ -58,12 +73,20 @@ resource "aws_instance" "dev" {
   tags = {
     Name        = "dev-instance",
     Environment = "dev"
+    git_org     = "LironElbaz"
+    git_repo    = "cloudgoat"
+    yor_trace   = "yor_trace"
   }
 }
 
 # IAM user
 resource "aws_iam_user" "readonly_user" {
   name = local.repo_readonly_username
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 resource "aws_iam_user_ssh_key" "readonly_user" {
   username   = aws_iam_user.readonly_user.name
diff --git a/scenarios/cicd/terraform/initial_iam_user.tf b/scenarios/cicd/terraform/initial_iam_user.tf
index 3eed5981..7291f75f 100644
--- a/scenarios/cicd/terraform/initial_iam_user.tf
+++ b/scenarios/cicd/terraform/initial_iam_user.tf
@@ -1,5 +1,10 @@
 resource "aws_iam_user" "initial" {
   name = local.initial_username
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 resource "aws_iam_user_policy" "initial" {
   name = "initial-policy"
diff --git a/scenarios/cicd/terraform/rw_iam_user.tf b/scenarios/cicd/terraform/rw_iam_user.tf
index af2124a9..41b9eb21 100644
--- a/scenarios/cicd/terraform/rw_iam_user.tf
+++ b/scenarios/cicd/terraform/rw_iam_user.tf
@@ -1,5 +1,10 @@
 resource "aws_iam_user" "developer" {
   name = local.repo_readwrite_username
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 resource "aws_iam_user_policy" "developer" {
   name = "developer-policy"
diff --git a/scenarios/cicd/terraform/sdlc.tf b/scenarios/cicd/terraform/sdlc.tf
index da50c99a..163795ff 100644
--- a/scenarios/cicd/terraform/sdlc.tf
+++ b/scenarios/cicd/terraform/sdlc.tf
@@ -1,5 +1,10 @@
 resource "aws_codecommit_repository" "code" {
   repository_name = local.repository_name
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 locals {
@@ -22,11 +27,11 @@ resource "null_resource" "upload_files" {
     on_failure  = fail
     interpreter = ["bash", "-c"]
     environment = {
-      AWS_REGION = var.region,
+      AWS_REGION         = var.region,
       AWS_DEFAULT_REGION = var.region
     }
-    
-    command     = <<BASH
+
+    command = <<BASH
     set -e
     cat > "${local.src_path}/buildspec.old.yml" <<EOF
       ${local.vulnerable_file_content}
@@ -54,5 +59,10 @@ BASH
 resource "aws_ecr_repository" "app" {
   name                 = local.ecr_repository_name
   image_tag_mutability = "MUTABLE"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
diff --git a/scenarios/cicd/terraform/simulate_user_activity.tf b/scenarios/cicd/terraform/simulate_user_activity.tf
index f3c68b15..07150900 100644
--- a/scenarios/cicd/terraform/simulate_user_activity.tf
+++ b/scenarios/cicd/terraform/simulate_user_activity.tf
@@ -16,6 +16,11 @@ resource "aws_iam_role" "simulate-user-activity-scheduling" {
   ]
 }
 EOF
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 resource "aws_iam_role_policy" "simulate-user-activity-scheduling" {
@@ -41,6 +46,11 @@ resource "aws_cloudwatch_event_rule" "schedule" {
   name                = "simulated-user-activity"
   description         = "Simulate user activity on the API"
   schedule_expression = "rate(1 minute)"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 resource "aws_cloudwatch_event_target" "codebuild" {
   target_id = "trigger-codebuild"
@@ -82,6 +92,11 @@ resource "aws_codebuild_project" "simulate-user-activity" {
     type      = "NO_SOURCE"
     buildspec = file("${path.module}/../assets/simulated-user-activity/buildspec.yml")
   }
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 
@@ -102,6 +117,11 @@ resource "aws_iam_role" "simulate-user-activity" {
   ]
 }
 EOF
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 resource "aws_iam_role_policy" "simulate-user-activity" {
   role = aws_iam_role.simulate-user-activity.name
diff --git a/scenarios/cloud_breach_s3/terraform/ec2.tf b/scenarios/cloud_breach_s3/terraform/ec2.tf
index b064fa52..dbda60f5 100644
--- a/scenarios/cloud_breach_s3/terraform/ec2.tf
+++ b/scenarios/cloud_breach_s3/terraform/ec2.tf
@@ -1,6 +1,6 @@
 #IAM Role
 resource "aws_iam_role" "cg-banking-WAF-Role" {
-  name = "cg-banking-WAF-Role-${var.cgid}"
+  name               = "cg-banking-WAF-Role-${var.cgid}"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -17,15 +17,18 @@ resource "aws_iam_role" "cg-banking-WAF-Role" {
 }
 EOF
   tags = {
-      Name = "cg-banking-WAF-Role-${var.cgid}"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "cg-banking-WAF-Role-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 
 #IAM Role Policy Attachment
 resource "aws_iam_role_policy_attachment" "cg-banking-WAF-Role-policy-attachment-s3" {
-  role = "${aws_iam_role.cg-banking-WAF-Role.name}"
+  role       = "${aws_iam_role.cg-banking-WAF-Role.name}"
   policy_arn = "${data.aws_iam_policy.s3-full-access.arn}"
 }
 
@@ -33,90 +36,106 @@ resource "aws_iam_role_policy_attachment" "cg-banking-WAF-Role-policy-attachment
 resource "aws_iam_instance_profile" "cg-ec2-instance-profile" {
   name = "cg-ec2-instance-profile-${var.cgid}"
   role = "${aws_iam_role.cg-banking-WAF-Role.name}"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 #Security Groups
 resource "aws_security_group" "cg-ec2-ssh-security-group" {
-  name = "cg-ec2-ssh-${var.cgid}"
+  name        = "cg-ec2-ssh-${var.cgid}"
   description = "CloudGoat ${var.cgid} Security Group for EC2 Instance over SSH"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  vpc_id      = "${aws_vpc.cg-vpc.id}"
   ingress {
-      from_port = 22
-      to_port = 22
-      protocol = "tcp"
-      cidr_blocks = var.cg_whitelist
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = var.cg_whitelist
   }
   egress {
-      from_port = 0
-      to_port = 0
-      protocol = "-1"
-      cidr_blocks = [
-          "0.0.0.0/0"
-      ]
+    from_port = 0
+    to_port   = 0
+    protocol  = "-1"
+    cidr_blocks = [
+      "0.0.0.0/0"
+    ]
   }
   tags = {
-    Name = "cg-ec2-ssh-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-ec2-ssh-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_security_group" "cg-ec2-http-security-group" {
-  name = "cg-ec2-http-${var.cgid}"
+  name        = "cg-ec2-http-${var.cgid}"
   description = "CloudGoat ${var.cgid} Security Group for EC2 Instance over HTTP"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  vpc_id      = "${aws_vpc.cg-vpc.id}"
   ingress {
-      from_port = 80
-      to_port = 80
-      protocol = "tcp"
-      cidr_blocks = var.cg_whitelist
+    from_port   = 80
+    to_port     = 80
+    protocol    = "tcp"
+    cidr_blocks = var.cg_whitelist
   }
   egress {
-      from_port = 0
-      to_port = 0
-      protocol = "-1"
-      cidr_blocks = [
-          "0.0.0.0/0"
-      ]
+    from_port = 0
+    to_port   = 0
+    protocol  = "-1"
+    cidr_blocks = [
+      "0.0.0.0/0"
+    ]
   }
   tags = {
-    Name = "cg-ec2-http-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-ec2-http-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #AWS Key Pair
 resource "aws_key_pair" "cg-ec2-key-pair" {
-  key_name = "cg-ec2-key-pair-${var.cgid}"
+  key_name   = "cg-ec2-key-pair-${var.cgid}"
   public_key = "${file(var.ssh-public-key-for-ec2)}"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 #EC2 Instance
 resource "aws_instance" "ec2-vulnerable-proxy-server" {
-    ami = "ami-0a313d6098716f372"
-    instance_type = "t2.micro"
-    iam_instance_profile = "${aws_iam_instance_profile.cg-ec2-instance-profile.name}"
-    subnet_id = "${aws_subnet.cg-public-subnet-1.id}"
-    associate_public_ip_address = true
-    vpc_security_group_ids = [
-        "${aws_security_group.cg-ec2-ssh-security-group.id}",
-        "${aws_security_group.cg-ec2-http-security-group.id}"
-    ]
-    key_name = "${aws_key_pair.cg-ec2-key-pair.key_name}"
-    root_block_device {
-        volume_type = "gp2"
-        volume_size = 8
-        delete_on_termination = true
-    }
-    provisioner "file" {
-      source = "../assets/proxy.com"
-      destination = "/home/ubuntu/proxy.com"
-      connection {
-        type = "ssh"
-        user = "ubuntu"
-        private_key = "${file(var.ssh-private-key-for-ec2)}"
-        host = self.public_ip
-      }
+  ami                         = "ami-0a313d6098716f372"
+  instance_type               = "t2.micro"
+  iam_instance_profile        = "${aws_iam_instance_profile.cg-ec2-instance-profile.name}"
+  subnet_id                   = "${aws_subnet.cg-public-subnet-1.id}"
+  associate_public_ip_address = true
+  vpc_security_group_ids = [
+    "${aws_security_group.cg-ec2-ssh-security-group.id}",
+    "${aws_security_group.cg-ec2-http-security-group.id}"
+  ]
+  key_name = "${aws_key_pair.cg-ec2-key-pair.key_name}"
+  root_block_device {
+    volume_type           = "gp2"
+    volume_size           = 8
+    delete_on_termination = true
+  }
+  provisioner "file" {
+    source      = "../assets/proxy.com"
+    destination = "/home/ubuntu/proxy.com"
+    connection {
+      type        = "ssh"
+      user        = "ubuntu"
+      private_key = "${file(var.ssh-private-key-for-ec2)}"
+      host        = self.public_ip
     }
-    user_data = <<-EOF
+  }
+  user_data = <<-EOF
         #!/bin/bash
         apt-get update
         apt-get install -y nginx
@@ -125,14 +144,17 @@ resource "aws_instance" "ec2-vulnerable-proxy-server" {
         rm /etc/nginx/sites-enabled/default
         systemctl restart nginx
         EOF
-    volume_tags = {
-        Name = "CloudGoat ${var.cgid} EC2 Instance Root Device"
-        Stack = "${var.stack-name}"
-        Scenario = "${var.scenario-name}"
-    }
-    tags = {
-        Name = "ec2-vulnerable-proxy-server-${var.cgid}"
-        Stack = "${var.stack-name}"
-        Scenario = "${var.scenario-name}"
-    }
+  volume_tags = {
+    Name     = "CloudGoat ${var.cgid} EC2 Instance Root Device"
+    Stack    = "${var.stack-name}"
+    Scenario = "${var.scenario-name}"
+  }
+  tags = {
+    Name      = "ec2-vulnerable-proxy-server-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
\ No newline at end of file
diff --git a/scenarios/cloud_breach_s3/terraform/s3.tf b/scenarios/cloud_breach_s3/terraform/s3.tf
index 9ebc7ed6..d2df2d40 100644
--- a/scenarios/cloud_breach_s3/terraform/s3.tf
+++ b/scenarios/cloud_breach_s3/terraform/s3.tf
@@ -7,53 +7,68 @@ locals {
 }
 
 resource "aws_s3_bucket" "cg-cardholder-data-bucket" {
-  bucket = "cg-cardholder-data-bucket-${local.bucket_suffix}"
-  acl = "private"
+  bucket        = "cg-cardholder-data-bucket-${local.bucket_suffix}"
+  acl           = "private"
   force_destroy = true
   tags = {
-      Name = "cg-cardholder-data-bucket-${local.bucket_suffix}"
-      Description = "CloudGoat ${var.cgid} S3 Bucket used for storing sensitive cardholder data."
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name        = "cg-cardholder-data-bucket-${local.bucket_suffix}"
+    Description = "CloudGoat ${var.cgid} S3 Bucket used for storing sensitive cardholder data."
+    Stack       = "${var.stack-name}"
+    Scenario    = "${var.scenario-name}"
+    git_org     = "LironElbaz"
+    git_repo    = "cloudgoat"
+    yor_trace   = "yor_trace"
   }
 }
 resource "aws_s3_bucket_object" "cardholder-data-primary" {
   bucket = "${aws_s3_bucket.cg-cardholder-data-bucket.id}"
-  key = "cardholder_data_primary.csv"
+  key    = "cardholder_data_primary.csv"
   source = "../assets/cardholder_data_primary.csv"
   tags = {
-    Name = "cardholder-data-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cardholder-data-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_s3_bucket_object" "cardholder-data-secondary" {
   bucket = "${aws_s3_bucket.cg-cardholder-data-bucket.id}"
-  key = "cardholder_data_secondary.csv"
+  key    = "cardholder_data_secondary.csv"
   source = "../assets/cardholder_data_secondary.csv"
   tags = {
-    Name = "cardholder-data-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cardholder-data-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_s3_bucket_object" "cardholder-data-corporate" {
   bucket = "${aws_s3_bucket.cg-cardholder-data-bucket.id}"
-  key = "cardholders_corporate.csv"
+  key    = "cardholders_corporate.csv"
   source = "../assets/cardholders_corporate.csv"
   tags = {
-    Name = "cardholder-data-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cardholder-data-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_s3_bucket_object" "goat" {
   bucket = "${aws_s3_bucket.cg-cardholder-data-bucket.id}"
-  key = "goat.png"
+  key    = "goat.png"
   source = "../assets/goat.png"
   tags = {
-    Name = "cardholder-data-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cardholder-data-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
\ No newline at end of file
diff --git a/scenarios/cloud_breach_s3/terraform/vpc.tf b/scenarios/cloud_breach_s3/terraform/vpc.tf
index a561d209..3c99f420 100644
--- a/scenarios/cloud_breach_s3/terraform/vpc.tf
+++ b/scenarios/cloud_breach_s3/terraform/vpc.tf
@@ -1,61 +1,76 @@
 resource "aws_vpc" "cg-vpc" {
-  cidr_block = "10.10.0.0/16"
+  cidr_block           = "10.10.0.0/16"
   enable_dns_hostnames = true
   tags = {
-      Name = "CloudGoat ${var.cgid} VPC"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} VPC"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Internet Gateway
 resource "aws_internet_gateway" "cg-internet-gateway" {
   vpc_id = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat ${var.cgid} Internet Gateway"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} Internet Gateway"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Public Subnets
 resource "aws_subnet" "cg-public-subnet-1" {
   availability_zone = "${var.region}a"
-  cidr_block = "10.10.10.0/24"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  cidr_block        = "10.10.10.0/24"
+  vpc_id            = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat ${var.cgid} Public Subnet #1"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} Public Subnet #1"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_subnet" "cg-public-subnet-2" {
   availability_zone = "${var.region}b"
-  cidr_block = "10.10.20.0/24"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  cidr_block        = "10.10.20.0/24"
+  vpc_id            = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat ${var.cgid} Public Subnet #2"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} Public Subnet #2"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Public Subnet Routing Table
 resource "aws_route_table" "cg-public-subnet-route-table" {
   route {
-      cidr_block = "0.0.0.0/0"
-      gateway_id = "${aws_internet_gateway.cg-internet-gateway.id}"
+    cidr_block = "0.0.0.0/0"
+    gateway_id = "${aws_internet_gateway.cg-internet-gateway.id}"
   }
   vpc_id = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat ${var.cgid} Route Table for Public Subnet"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} Route Table for Public Subnet"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Public Subnets Routing Associations
 resource "aws_route_table_association" "cg-public-subnet-1-route-association" {
-  subnet_id = "${aws_subnet.cg-public-subnet-1.id}"
+  subnet_id      = "${aws_subnet.cg-public-subnet-1.id}"
   route_table_id = "${aws_route_table.cg-public-subnet-route-table.id}"
 }
 resource "aws_route_table_association" "cg-public-subnet-2-route-association" {
-  subnet_id = "${aws_subnet.cg-public-subnet-2.id}"
+  subnet_id      = "${aws_subnet.cg-public-subnet-2.id}"
   route_table_id = "${aws_route_table.cg-public-subnet-route-table.id}"
 }
\ No newline at end of file
diff --git a/scenarios/codebuild_secrets/terraform/codebuild.tf b/scenarios/codebuild_secrets/terraform/codebuild.tf
index f239530e..cbf8a7ca 100644
--- a/scenarios/codebuild_secrets/terraform/codebuild.tf
+++ b/scenarios/codebuild_secrets/terraform/codebuild.tf
@@ -1,6 +1,6 @@
 #IAM Role for AWS CodeBuild Project
 resource "aws_iam_role" "cg-codebuild-role" {
-  name = "code-build-cg-${var.cgid}-service-role"
+  name               = "code-build-cg-${var.cgid}-service-role"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -16,15 +16,18 @@ resource "aws_iam_role" "cg-codebuild-role" {
 }
 EOF
   tags = {
-    Name = "code-build-cg-${var.cgid}-service-role"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "code-build-cg-${var.cgid}-service-role"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Inline Policy for AWS CodeBuild Project IAM Role
 resource "aws_iam_role_policy" "cg-codebuild-role-policy" {
-  name = "code-build-cg-${var.cgid}-policy"
-  role = "${aws_iam_role.cg-codebuild-role.name}"
+  name   = "code-build-cg-${var.cgid}-policy"
+  role   = "${aws_iam_role.cg-codebuild-role.name}"
   policy = <<POLICY
 {
   "Version": "2012-10-17",
@@ -59,34 +62,37 @@ POLICY
 }
 #AWS CodeBuildProjects
 resource "aws_codebuild_project" "cg-codebuild-project" {
-  name = "cg-codebuild-${var.cgid}"
+  name          = "cg-codebuild-${var.cgid}"
   build_timeout = 20
-  service_role = "${aws_iam_role.cg-codebuild-role.arn}"
+  service_role  = "${aws_iam_role.cg-codebuild-role.arn}"
   environment {
-      compute_type = "BUILD_GENERAL1_SMALL"
-      image = "aws/codebuild/standard:1.0"
-      type = "LINUX_CONTAINER"
-      image_pull_credentials_type = "CODEBUILD"
-      privileged_mode = false
-      environment_variable {
-          name = "calrissian-aws-access-key"
-          value = "${aws_iam_access_key.cg-calrissian.id}"
-      }
-      environment_variable {
-          name = "calrissian-aws-secret-key"
-          value = "${aws_iam_access_key.cg-calrissian.secret}"
-      }
+    compute_type                = "BUILD_GENERAL1_SMALL"
+    image                       = "aws/codebuild/standard:1.0"
+    type                        = "LINUX_CONTAINER"
+    image_pull_credentials_type = "CODEBUILD"
+    privileged_mode             = false
+    environment_variable {
+      name  = "calrissian-aws-access-key"
+      value = "${aws_iam_access_key.cg-calrissian.id}"
+    }
+    environment_variable {
+      name  = "calrissian-aws-secret-key"
+      value = "${aws_iam_access_key.cg-calrissian.secret}"
+    }
   }
   source {
-      type = "NO_SOURCE"
-      buildspec = "${file("../assets/buildspec.yml")}"
+    type      = "NO_SOURCE"
+    buildspec = "${file("../assets/buildspec.yml")}"
   }
   artifacts {
-      type = "NO_ARTIFACTS"
+    type = "NO_ARTIFACTS"
   }
   tags = {
-    Name = "cg-codebuild-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-codebuild-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
\ No newline at end of file
diff --git a/scenarios/codebuild_secrets/terraform/ec2.tf b/scenarios/codebuild_secrets/terraform/ec2.tf
index 58d5b67d..ab141577 100644
--- a/scenarios/codebuild_secrets/terraform/ec2.tf
+++ b/scenarios/codebuild_secrets/terraform/ec2.tf
@@ -1,6 +1,6 @@
 #IAM Role
 resource "aws_iam_role" "cg-ec2-role" {
-  name = "cg-ec2-role-${var.cgid}"
+  name               = "cg-ec2-role-${var.cgid}"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -17,16 +17,19 @@ resource "aws_iam_role" "cg-ec2-role" {
 }
 EOF
   tags = {
-      Name = "cg-ec2-role-${var.cgid}"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "cg-ec2-role-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Iam Role Policy
 resource "aws_iam_policy" "cg-ec2-role-policy" {
-  name = "cg-ec2-role-policy-${var.cgid}"
+  name        = "cg-ec2-role-policy-${var.cgid}"
   description = "cg-ec2-role-policy-${var.cgid}"
-  policy = <<POLICY
+  policy      = <<POLICY
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -43,12 +46,17 @@ resource "aws_iam_policy" "cg-ec2-role-policy" {
     ]
 }
 POLICY
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 #IAM Role Policy Attachment
 resource "aws_iam_policy_attachment" "cg-ec2-role-policy-attachment" {
   name = "cg-ec2-role-policy-attachment-${var.cgid}"
   roles = [
-      "${aws_iam_role.cg-ec2-role.name}"
+    "${aws_iam_role.cg-ec2-role.name}"
   ]
   policy_arn = "${aws_iam_policy.cg-ec2-role-policy.arn}"
 }
@@ -56,54 +64,67 @@ resource "aws_iam_policy_attachment" "cg-ec2-role-policy-attachment" {
 resource "aws_iam_instance_profile" "cg-ec2-instance-profile" {
   name = "cg-ec2-instance-profile-${var.cgid}"
   role = "${aws_iam_role.cg-ec2-role.name}"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 #Security Groups
 resource "aws_security_group" "cg-ec2-ssh-security-group" {
-  name = "cg-ec2-ssh-${var.cgid}"
+  name        = "cg-ec2-ssh-${var.cgid}"
   description = "CloudGoat ${var.cgid} Security Group for EC2 Instance over SSH"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  vpc_id      = "${aws_vpc.cg-vpc.id}"
   ingress {
-      from_port = 22
-      to_port = 22
-      protocol = "tcp"
-      cidr_blocks = var.cg_whitelist
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = var.cg_whitelist
   }
   egress {
-      from_port = 0
-      to_port = 0
-      protocol = "-1"
-      cidr_blocks = [
-          "0.0.0.0/0"
-      ]
+    from_port = 0
+    to_port   = 0
+    protocol  = "-1"
+    cidr_blocks = [
+      "0.0.0.0/0"
+    ]
   }
   tags = {
-    Name = "cg-ec2-ssh-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-ec2-ssh-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #AWS Key Pair
 resource "aws_key_pair" "cg-ec2-key-pair" {
-  key_name = "cg-ec2-key-pair-${var.cgid}"
+  key_name   = "cg-ec2-key-pair-${var.cgid}"
   public_key = "${file(var.ssh-public-key-for-ec2)}"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 #EC2 Instance
 resource "aws_instance" "cg-ubuntu-ec2" {
-    ami = "ami-0a313d6098716f372"
-    instance_type = "t2.micro"
-    iam_instance_profile = "${aws_iam_instance_profile.cg-ec2-instance-profile.name}"
-    subnet_id = "${aws_subnet.cg-public-subnet-1.id}"
-    associate_public_ip_address = true
-    vpc_security_group_ids = [
-        "${aws_security_group.cg-ec2-ssh-security-group.id}"
-    ]
-    key_name = "${aws_key_pair.cg-ec2-key-pair.key_name}"
-    root_block_device {
-        volume_type = "gp2"
-        volume_size = 8
-        delete_on_termination = true
-    }
-    user_data = <<-EOF
+  ami                         = "ami-0a313d6098716f372"
+  instance_type               = "t2.micro"
+  iam_instance_profile        = "${aws_iam_instance_profile.cg-ec2-instance-profile.name}"
+  subnet_id                   = "${aws_subnet.cg-public-subnet-1.id}"
+  associate_public_ip_address = true
+  vpc_security_group_ids = [
+    "${aws_security_group.cg-ec2-ssh-security-group.id}"
+  ]
+  key_name = "${aws_key_pair.cg-ec2-key-pair.key_name}"
+  root_block_device {
+    volume_type           = "gp2"
+    volume_size           = 8
+    delete_on_termination = true
+  }
+  user_data = <<-EOF
         #!/bin/bash
         apt-get update
         apt-get install -y postgresql-client
@@ -114,14 +135,17 @@ resource "aws_instance" "cg-ubuntu-ec2" {
         psql postgresql://${var.rds-username}:${var.rds-password}@${aws_db_instance.cg-psql-rds.endpoint}/${var.rds-database-name} \
         -c "INSERT INTO sensitive_information (name,value) VALUES ('Key2','V\!C70RY-JpZFReKtvUiWuhyPGF20m4SDYJtOTxws6');"
         EOF
-    volume_tags = {
-        Name = "CloudGoat ${var.cgid} EC2 Instance Root Device"
-        Stack = "${var.stack-name}"
-        Scenario = "${var.scenario-name}"
-    }
-    tags = {
-        Name = "cg-ubuntu-ec2-${var.cgid}"
-        Stack = "${var.stack-name}"
-        Scenario = "${var.scenario-name}"
-    }
+  volume_tags = {
+    Name     = "CloudGoat ${var.cgid} EC2 Instance Root Device"
+    Stack    = "${var.stack-name}"
+    Scenario = "${var.scenario-name}"
+  }
+  tags = {
+    Name      = "cg-ubuntu-ec2-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
\ No newline at end of file
diff --git a/scenarios/codebuild_secrets/terraform/iam.tf b/scenarios/codebuild_secrets/terraform/iam.tf
index 0abc4148..dda9248b 100644
--- a/scenarios/codebuild_secrets/terraform/iam.tf
+++ b/scenarios/codebuild_secrets/terraform/iam.tf
@@ -1,9 +1,12 @@
 resource "aws_iam_user" "cg-calrissian" {
   name = "calrissian"
   tags = {
-    Name = "cg-calrissian-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-calrissian-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_iam_access_key" "cg-calrissian" {
@@ -12,9 +15,12 @@ resource "aws_iam_access_key" "cg-calrissian" {
 resource "aws_iam_user" "cg-solo" {
   name = "solo"
   tags = {
-    Name = "cg-solo-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-solo-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_iam_access_key" "cg-solo" {
@@ -22,9 +28,9 @@ resource "aws_iam_access_key" "cg-solo" {
 }
 #IAM User Policies
 resource "aws_iam_policy" "cg-calrissian-policy" {
-  name = "cg-calrissian-policy-${var.cgid}"
+  name        = "cg-calrissian-policy-${var.cgid}"
   description = "cg-calrissian-policy-${var.cgid}"
-  policy = <<EOF
+  policy      = <<EOF
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -51,11 +57,16 @@ resource "aws_iam_policy" "cg-calrissian-policy" {
     ]
 }
 EOF
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 resource "aws_iam_policy" "cg-solo-policy" {
-  name = "cg-solo-policy-${var.cgid}"
+  name        = "cg-solo-policy-${var.cgid}"
   description = "cg-solo-policy-${var.cgid}"
-  policy = <<EOF
+  policy      = <<EOF
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -79,13 +90,18 @@ resource "aws_iam_policy" "cg-solo-policy" {
     ]
 }
 EOF
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 #User Policy Attachments
 resource "aws_iam_user_policy_attachment" "cg-calrissian-attachment" {
-  user = "${aws_iam_user.cg-calrissian.name}"
+  user       = "${aws_iam_user.cg-calrissian.name}"
   policy_arn = "${aws_iam_policy.cg-calrissian-policy.arn}"
 }
 resource "aws_iam_user_policy_attachment" "cg-solo-attachment" {
-  user = "${aws_iam_user.cg-solo.name}"
+  user       = "${aws_iam_user.cg-solo.name}"
   policy_arn = "${aws_iam_policy.cg-solo-policy.arn}"
 }
\ No newline at end of file
diff --git a/scenarios/codebuild_secrets/terraform/lambda.tf b/scenarios/codebuild_secrets/terraform/lambda.tf
index 699a2224..c83a8bbd 100644
--- a/scenarios/codebuild_secrets/terraform/lambda.tf
+++ b/scenarios/codebuild_secrets/terraform/lambda.tf
@@ -1,10 +1,10 @@
 data "archive_file" "cg-lambda-function" {
-  type = "zip"
+  type        = "zip"
   source_file = "../assets/lambda.py"
   output_path = "../assets/lambda.zip"
 }
 resource "aws_iam_role" "cg-lambda-role" {
-  name = "cg-lambda-role-${var.cgid}-service-role"
+  name               = "cg-lambda-role-${var.cgid}-service-role"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -21,28 +21,34 @@ resource "aws_iam_role" "cg-lambda-role" {
 }
 EOF
   tags = {
-    Name = "cg-lambda-role-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-lambda-role-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_lambda_function" "cg-lambda-function" {
-  filename = "../assets/lambda.zip"
-  function_name = "cg-lambda-${var.cgid}"
-  role = "${aws_iam_role.cg-lambda-role.arn}"
-  handler = "lambda.handler"
+  filename         = "../assets/lambda.zip"
+  function_name    = "cg-lambda-${var.cgid}"
+  role             = "${aws_iam_role.cg-lambda-role.arn}"
+  handler          = "lambda.handler"
   source_code_hash = "${data.archive_file.cg-lambda-function.output_base64sha256}"
-  runtime = "python3.6"
+  runtime          = "python3.6"
   environment {
-      variables = {
-          DB_NAME = "${var.rds-database-name}"
-          DB_USER = "${var.rds-username}"
-          DB_PASSWORD = "${var.rds-password}"
-      }
+    variables = {
+      DB_NAME     = "${var.rds-database-name}"
+      DB_USER     = "${var.rds-username}"
+      DB_PASSWORD = "${var.rds-password}"
+    }
   }
   tags = {
-    Name = "cg-lambda-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-lambda-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
\ No newline at end of file
diff --git a/scenarios/codebuild_secrets/terraform/rds.tf b/scenarios/codebuild_secrets/terraform/rds.tf
index 31893574..a461e846 100644
--- a/scenarios/codebuild_secrets/terraform/rds.tf
+++ b/scenarios/codebuild_secrets/terraform/rds.tf
@@ -1,75 +1,93 @@
 #Security Group
 resource "aws_security_group" "cg-rds-security-group" {
-  name = "cg-rds-psql-${var.cgid}"
+  name        = "cg-rds-psql-${var.cgid}"
   description = "CloudGoat ${var.cgid} Security Group for PostgreSQL RDS Instance"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  vpc_id      = "${aws_vpc.cg-vpc.id}"
   ingress {
-      from_port = 5432
-      to_port = 5432
-      protocol = "tcp"
-      cidr_blocks = [
-          "10.10.10.0/24",
-          "10.10.20.0/24",
-          "10.10.30.0/24",
-          "10.10.40.0/24"
-      ]
+    from_port = 5432
+    to_port   = 5432
+    protocol  = "tcp"
+    cidr_blocks = [
+      "10.10.10.0/24",
+      "10.10.20.0/24",
+      "10.10.30.0/24",
+      "10.10.40.0/24"
+    ]
   }
   ingress {
-      from_port = 5432
-      to_port = 5432
-      protocol = "tcp"
-      cidr_blocks = var.cg_whitelist
+    from_port   = 5432
+    to_port     = 5432
+    protocol    = "tcp"
+    cidr_blocks = var.cg_whitelist
   }
   egress {
-      from_port = 0
-      to_port = 0
-      protocol = "-1"
-      cidr_blocks = [
-          "0.0.0.0/0"
-      ]
+    from_port = 0
+    to_port   = 0
+    protocol  = "-1"
+    cidr_blocks = [
+      "0.0.0.0/0"
+    ]
+  }
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #RDS Subnet Group
 resource "aws_db_subnet_group" "cg-rds-subnet-group" {
   name = "cloud-goat-rds-subnet-group-${var.cgid}"
   subnet_ids = [
-      "${aws_subnet.cg-private-subnet-1.id}",
-      "${aws_subnet.cg-private-subnet-2.id}"
+    "${aws_subnet.cg-private-subnet-1.id}",
+    "${aws_subnet.cg-private-subnet-2.id}"
   ]
   description = "CloudGoat ${var.cgid} Subnet Group"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 resource "aws_db_subnet_group" "cg-rds-testing-subnet-group" {
   name = "cloud-goat-rds-testing-subnet-group-${var.cgid}"
   subnet_ids = [
-      "${aws_subnet.cg-public-subnet-1.id}",
-      "${aws_subnet.cg-public-subnet-2.id}"
+    "${aws_subnet.cg-public-subnet-1.id}",
+    "${aws_subnet.cg-public-subnet-2.id}"
   ]
   description = "CloudGoat ${var.cgid} Subnet Group ONLY for Testing with Public Subnets"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 #RDS PostgreSQL Instance
 resource "aws_db_instance" "cg-psql-rds" {
-  identifier = "cg-rds-instance-${local.cgid_suffix}"
-  engine = "postgres"
-  engine_version = "9.6"
-  port = "5432"
-  instance_class = "db.t2.micro"
+  identifier           = "cg-rds-instance-${local.cgid_suffix}"
+  engine               = "postgres"
+  engine_version       = "9.6"
+  port                 = "5432"
+  instance_class       = "db.t2.micro"
   db_subnet_group_name = "${aws_db_subnet_group.cg-rds-subnet-group.id}"
-  multi_az = false
-  username = "${var.rds-username}"
-  password = "${var.rds-password}"
-  publicly_accessible = false
+  multi_az             = false
+  username             = "${var.rds-username}"
+  password             = "${var.rds-password}"
+  publicly_accessible  = false
   vpc_security_group_ids = [
     "${aws_security_group.cg-rds-security-group.id}"
   ]
-  storage_type = "gp2"
-  allocated_storage = 20
-  name = "${var.rds-database-name}"
-  apply_immediately = true
+  storage_type        = "gp2"
+  allocated_storage   = 20
+  name                = "${var.rds-database-name}"
+  apply_immediately   = true
   skip_final_snapshot = true
 
   tags = {
-      Name = "cg-rds-instance-${var.cgid}"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "cg-rds-instance-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
\ No newline at end of file
diff --git a/scenarios/codebuild_secrets/terraform/ssm-parameters.tf b/scenarios/codebuild_secrets/terraform/ssm-parameters.tf
index 31fe2eae..c93218cf 100644
--- a/scenarios/codebuild_secrets/terraform/ssm-parameters.tf
+++ b/scenarios/codebuild_secrets/terraform/ssm-parameters.tf
@@ -1,23 +1,29 @@
 #AWS SSM Parameters
 resource "aws_ssm_parameter" "cg-ec2-public-key" {
-  name = "cg-ec2-public-key-${var.cgid}"
+  name        = "cg-ec2-public-key-${var.cgid}"
   description = "cg-ec2-public-key-${var.cgid}"
-  type = "String"
-  value = "${file("../cloudgoat.pub")}"
+  type        = "String"
+  value       = "${file("../cloudgoat.pub")}"
   tags = {
-    Name = "cg-ec2-public-key-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-ec2-public-key-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_ssm_parameter" "cg-ec2-private-key" {
-  name = "cg-ec2-private-key-${var.cgid}"
+  name        = "cg-ec2-private-key-${var.cgid}"
   description = "cg-ec2-private-key-${var.cgid}"
-  type = "String"
-  value = "${file("../cloudgoat")}"
+  type        = "String"
+  value       = "${file("../cloudgoat")}"
   tags = {
-    Name = "cg-ec2-private-key-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-ec2-private-key-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
\ No newline at end of file
diff --git a/scenarios/codebuild_secrets/terraform/vpc.tf b/scenarios/codebuild_secrets/terraform/vpc.tf
index f608859f..22feabc0 100644
--- a/scenarios/codebuild_secrets/terraform/vpc.tf
+++ b/scenarios/codebuild_secrets/terraform/vpc.tf
@@ -1,100 +1,124 @@
 resource "aws_vpc" "cg-vpc" {
-  cidr_block = "10.10.0.0/16"
+  cidr_block           = "10.10.0.0/16"
   enable_dns_hostnames = true
   tags = {
-      Name = "CloudGoat ${var.cgid} VPC"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} VPC"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Internet Gateway
 resource "aws_internet_gateway" "cg-internet-gateway" {
   vpc_id = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat ${var.cgid} Internet Gateway"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} Internet Gateway"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Public Subnets
 resource "aws_subnet" "cg-public-subnet-1" {
   availability_zone = "${var.region}a"
-  cidr_block = "10.10.10.0/24"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  cidr_block        = "10.10.10.0/24"
+  vpc_id            = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat ${var.cgid} Public Subnet #1"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} Public Subnet #1"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_subnet" "cg-public-subnet-2" {
   availability_zone = "${var.region}b"
-  cidr_block = "10.10.20.0/24"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  cidr_block        = "10.10.20.0/24"
+  vpc_id            = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat ${var.cgid} Public Subnet #2"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} Public Subnet #2"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Private Subnets
 resource "aws_subnet" "cg-private-subnet-1" {
   availability_zone = "${var.region}a"
-  cidr_block = "10.10.30.0/24"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  cidr_block        = "10.10.30.0/24"
+  vpc_id            = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat ${var.cgid} Private Subnet #1"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} Private Subnet #1"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_subnet" "cg-private-subnet-2" {
   availability_zone = "${var.region}b"
-  cidr_block = "10.10.40.0/24"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  cidr_block        = "10.10.40.0/24"
+  vpc_id            = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat ${var.cgid} Private Subnet #2"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} Private Subnet #2"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Public Subnet Routing Table
 resource "aws_route_table" "cg-public-subnet-route-table" {
   route {
-      cidr_block = "0.0.0.0/0"
-      gateway_id = "${aws_internet_gateway.cg-internet-gateway.id}"
+    cidr_block = "0.0.0.0/0"
+    gateway_id = "${aws_internet_gateway.cg-internet-gateway.id}"
   }
   vpc_id = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat ${var.cgid} Route Table for Public Subnet"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} Route Table for Public Subnet"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Private Subnet Routing Table
 resource "aws_route_table" "cg-private-subnet-route-table" {
   vpc_id = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat ${var.cgid} Route Table for Private Subnet"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} Route Table for Private Subnet"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Public Subnets Routing Associations
 resource "aws_route_table_association" "cg-public-subnet-1-route-association" {
-  subnet_id = "${aws_subnet.cg-public-subnet-1.id}"
+  subnet_id      = "${aws_subnet.cg-public-subnet-1.id}"
   route_table_id = "${aws_route_table.cg-public-subnet-route-table.id}"
 }
 resource "aws_route_table_association" "cg-public-subnet-2-route-association" {
-  subnet_id = "${aws_subnet.cg-public-subnet-2.id}"
+  subnet_id      = "${aws_subnet.cg-public-subnet-2.id}"
   route_table_id = "${aws_route_table.cg-public-subnet-route-table.id}"
 }
 #Private Subnets Routing Associations
 resource "aws_route_table_association" "cg-priate-subnet-1-route-association" {
-  subnet_id = "${aws_subnet.cg-private-subnet-1.id}"
+  subnet_id      = "${aws_subnet.cg-private-subnet-1.id}"
   route_table_id = "${aws_route_table.cg-private-subnet-route-table.id}"
 }
 resource "aws_route_table_association" "cg-priate-subnet-2-route-association" {
-  subnet_id = "${aws_subnet.cg-private-subnet-2.id}"
+  subnet_id      = "${aws_subnet.cg-private-subnet-2.id}"
   route_table_id = "${aws_route_table.cg-private-subnet-route-table.id}"
 }
\ No newline at end of file
diff --git a/scenarios/ec2_ssrf/terraform/ec2.tf b/scenarios/ec2_ssrf/terraform/ec2.tf
index c347caca..4a88487a 100644
--- a/scenarios/ec2_ssrf/terraform/ec2.tf
+++ b/scenarios/ec2_ssrf/terraform/ec2.tf
@@ -1,6 +1,6 @@
 #IAM Role
 resource "aws_iam_role" "cg-ec2-role" {
-  name = "cg-ec2-role-${var.cgid}"
+  name               = "cg-ec2-role-${var.cgid}"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -17,16 +17,19 @@ resource "aws_iam_role" "cg-ec2-role" {
 }
 EOF
   tags = {
-      Name = "cg-ec2-role-${var.cgid}"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "cg-ec2-role-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Iam Role Policy
 resource "aws_iam_policy" "cg-ec2-role-policy" {
-  name = "cg-ec2-role-policy-${var.cgid}"
+  name        = "cg-ec2-role-policy-${var.cgid}"
   description = "cg-ec2-role-policy-${var.cgid}"
-  policy = <<POLICY
+  policy      = <<POLICY
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -42,12 +45,17 @@ resource "aws_iam_policy" "cg-ec2-role-policy" {
     ]
 }
 POLICY
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 #IAM Role Policy Attachment
 resource "aws_iam_policy_attachment" "cg-ec2-role-policy-attachment" {
   name = "cg-ec2-role-policy-attachment-${var.cgid}"
   roles = [
-      "${aws_iam_role.cg-ec2-role.name}"
+    "${aws_iam_role.cg-ec2-role.name}"
   ]
   policy_arn = "${aws_iam_policy.cg-ec2-role-policy.arn}"
 }
@@ -55,89 +63,105 @@ resource "aws_iam_policy_attachment" "cg-ec2-role-policy-attachment" {
 resource "aws_iam_instance_profile" "cg-ec2-instance-profile" {
   name = "cg-ec2-instance-profile-${var.cgid}"
   role = "${aws_iam_role.cg-ec2-role.name}"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 #Security Groups
 resource "aws_security_group" "cg-ec2-ssh-security-group" {
-  name = "cg-ec2-ssh-${var.cgid}"
+  name        = "cg-ec2-ssh-${var.cgid}"
   description = "CloudGoat ${var.cgid} Security Group for EC2 Instance over SSH"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  vpc_id      = "${aws_vpc.cg-vpc.id}"
   ingress {
-      from_port = 22
-      to_port = 22
-      protocol = "tcp"
-      cidr_blocks = var.cg_whitelist
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = var.cg_whitelist
   }
   egress {
-      from_port = 0
-      to_port = 0
-      protocol = "-1"
-      cidr_blocks = [
-          "0.0.0.0/0"
-      ]
+    from_port = 0
+    to_port   = 0
+    protocol  = "-1"
+    cidr_blocks = [
+      "0.0.0.0/0"
+    ]
   }
   tags = {
-    Name = "cg-ec2-ssh-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-ec2-ssh-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_security_group" "cg-ec2-http-security-group" {
-  name = "cg-ec2-http-${var.cgid}"
+  name        = "cg-ec2-http-${var.cgid}"
   description = "CloudGoat ${var.cgid} Security Group for EC2 Instance over HTTP"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  vpc_id      = "${aws_vpc.cg-vpc.id}"
   ingress {
-      from_port = 80
-      to_port = 80
-      protocol = "tcp"
-      cidr_blocks = var.cg_whitelist
+    from_port   = 80
+    to_port     = 80
+    protocol    = "tcp"
+    cidr_blocks = var.cg_whitelist
   }
   egress {
-      from_port = 0
-      to_port = 0
-      protocol = "-1"
-      cidr_blocks = [
-          "0.0.0.0/0"
-      ]
+    from_port = 0
+    to_port   = 0
+    protocol  = "-1"
+    cidr_blocks = [
+      "0.0.0.0/0"
+    ]
   }
   tags = {
-    Name = "cg-ec2-http-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-ec2-http-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #AWS Key Pair
 resource "aws_key_pair" "cg-ec2-key-pair" {
-  key_name = "cg-ec2-key-pair-${var.cgid}"
+  key_name   = "cg-ec2-key-pair-${var.cgid}"
   public_key = "${file(var.ssh-public-key-for-ec2)}"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 #EC2 Instance
 resource "aws_instance" "cg-ubuntu-ec2" {
-    ami = "ami-0a313d6098716f372"
-    instance_type = "t2.micro"
-    iam_instance_profile = "${aws_iam_instance_profile.cg-ec2-instance-profile.name}"
-    subnet_id = "${aws_subnet.cg-public-subnet-1.id}"
-    associate_public_ip_address = true
-    vpc_security_group_ids = [
-        "${aws_security_group.cg-ec2-ssh-security-group.id}",
-        "${aws_security_group.cg-ec2-http-security-group.id}"
-    ]
-    key_name = "${aws_key_pair.cg-ec2-key-pair.key_name}"
-    root_block_device {
-        volume_type = "gp2"
-        volume_size = 8
-        delete_on_termination = true
-    }
-    provisioner "file" {
-      source = "../assets/ssrf_app/app.zip"
-      destination = "/home/ubuntu/app.zip"
-      connection {
-        type = "ssh"
-        user = "ubuntu"
-        private_key = "${file(var.ssh-private-key-for-ec2)}"
-        host = self.public_ip
-      }
+  ami                         = "ami-0a313d6098716f372"
+  instance_type               = "t2.micro"
+  iam_instance_profile        = "${aws_iam_instance_profile.cg-ec2-instance-profile.name}"
+  subnet_id                   = "${aws_subnet.cg-public-subnet-1.id}"
+  associate_public_ip_address = true
+  vpc_security_group_ids = [
+    "${aws_security_group.cg-ec2-ssh-security-group.id}",
+    "${aws_security_group.cg-ec2-http-security-group.id}"
+  ]
+  key_name = "${aws_key_pair.cg-ec2-key-pair.key_name}"
+  root_block_device {
+    volume_type           = "gp2"
+    volume_size           = 8
+    delete_on_termination = true
+  }
+  provisioner "file" {
+    source      = "../assets/ssrf_app/app.zip"
+    destination = "/home/ubuntu/app.zip"
+    connection {
+      type        = "ssh"
+      user        = "ubuntu"
+      private_key = "${file(var.ssh-private-key-for-ec2)}"
+      host        = self.public_ip
     }
-    user_data = <<-EOF
+  }
+  user_data = <<-EOF
         #!/bin/bash
         apt-get update
         curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -
@@ -149,14 +173,17 @@ resource "aws_instance" "cg-ubuntu-ec2" {
         sudo node ssrf-demo-app.js &
         echo -e "\n* * * * * root node /home/ubuntu/app/ssrf-demo-app.js &\n* * * * * root sleep 10; node /home/ubuntu/app/ssrf-demo-app.js &\n* * * * * root sleep 20; node /home/ubuntu/app/ssrf-demo-app.js &\n* * * * * root sleep 30; node /home/ubuntu/app/ssrf-demo-app.js &\n* * * * * root sleep 40; node /home/ubuntu/app/ssrf-demo-app.js &\n* * * * * root sleep 50; node /home/ubuntu/app/ssrf-demo-app.js &\n" >> /etc/crontab
         EOF
-    volume_tags = {
-        Name = "CloudGoat ${var.cgid} EC2 Instance Root Device"
-        Stack = "${var.stack-name}"
-        Scenario = "${var.scenario-name}"
-    }
-    tags = {
-        Name = "cg-ubuntu-ec2-${var.cgid}"
-        Stack = "${var.stack-name}"
-        Scenario = "${var.scenario-name}"
-    }
+  volume_tags = {
+    Name     = "CloudGoat ${var.cgid} EC2 Instance Root Device"
+    Stack    = "${var.stack-name}"
+    Scenario = "${var.scenario-name}"
+  }
+  tags = {
+    Name      = "cg-ubuntu-ec2-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
diff --git a/scenarios/ec2_ssrf/terraform/iam.tf b/scenarios/ec2_ssrf/terraform/iam.tf
index 4db6e9a2..702c453e 100644
--- a/scenarios/ec2_ssrf/terraform/iam.tf
+++ b/scenarios/ec2_ssrf/terraform/iam.tf
@@ -2,9 +2,12 @@
 resource "aws_iam_user" "cg-solus" {
   name = "solus-${var.cgid}"
   tags = {
-    Name = "cg-solus-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-solus-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_iam_access_key" "cg-solus" {
@@ -13,9 +16,12 @@ resource "aws_iam_access_key" "cg-solus" {
 resource "aws_iam_user" "cg-wrex" {
   name = "wrex-${var.cgid}"
   tags = {
-    Name = "cg-wrex-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-wrex-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_iam_access_key" "cg-wrex" {
@@ -24,9 +30,12 @@ resource "aws_iam_access_key" "cg-wrex" {
 resource "aws_iam_user" "cg-shepard" {
   name = "shepard-${var.cgid}"
   tags = {
-    Name = "cg-shepard-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-shepard-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_iam_access_key" "cg-shepard" {
@@ -34,9 +43,9 @@ resource "aws_iam_access_key" "cg-shepard" {
 }
 #IAM User Policies
 resource "aws_iam_policy" "cg-solus-policy" {
-  name = "cg-solus-policy-${var.cgid}"
+  name        = "cg-solus-policy-${var.cgid}"
   description = "cg-solus-policy-${var.cgid}"
-  policy = <<EOF
+  policy      = <<EOF
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -52,11 +61,16 @@ resource "aws_iam_policy" "cg-solus-policy" {
     ]
 }
 EOF
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 resource "aws_iam_policy" "cg-wrex-policy" {
-  name = "cg-wrex-policy-${var.cgid}"
+  name        = "cg-wrex-policy-${var.cgid}"
   description = "cg-wrex-policy-${var.cgid}"
-  policy = <<EOF
+  policy      = <<EOF
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -71,11 +85,16 @@ resource "aws_iam_policy" "cg-wrex-policy" {
     ]
 }
 EOF
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 resource "aws_iam_policy" "cg-shepard-policy" {
-  name = "cg-shepard-policy-${var.cgid}"
+  name        = "cg-shepard-policy-${var.cgid}"
   description = "cg-shepard-policy-${var.cgid}"
-  policy = <<EOF
+  policy      = <<EOF
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -92,17 +111,22 @@ resource "aws_iam_policy" "cg-shepard-policy" {
     ]
 }
 EOF
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 #User Policy Attachments
 resource "aws_iam_user_policy_attachment" "cg-solus-attachment" {
-  user = "${aws_iam_user.cg-solus.name}"
+  user       = "${aws_iam_user.cg-solus.name}"
   policy_arn = "${aws_iam_policy.cg-solus-policy.arn}"
 }
 resource "aws_iam_user_policy_attachment" "cg-wrex-attachment" {
-  user = "${aws_iam_user.cg-wrex.name}"
+  user       = "${aws_iam_user.cg-wrex.name}"
   policy_arn = "${aws_iam_policy.cg-wrex-policy.arn}"
 }
 resource "aws_iam_user_policy_attachment" "cg-shepard-attachment" {
-  user = "${aws_iam_user.cg-shepard.name}"
+  user       = "${aws_iam_user.cg-shepard.name}"
   policy_arn = "${aws_iam_policy.cg-shepard-policy.arn}"
 }
\ No newline at end of file
diff --git a/scenarios/ec2_ssrf/terraform/lambda.tf b/scenarios/ec2_ssrf/terraform/lambda.tf
index d74591f4..bbc5a221 100644
--- a/scenarios/ec2_ssrf/terraform/lambda.tf
+++ b/scenarios/ec2_ssrf/terraform/lambda.tf
@@ -1,10 +1,10 @@
 data "archive_file" "cg-lambda-function" {
-  type = "zip"
+  type        = "zip"
   source_file = "../assets/lambda.py"
   output_path = "../assets/lambda.zip"
 }
 resource "aws_iam_role" "cg-lambda-role" {
-  name = "cg-lambda-role-${var.cgid}-service-role"
+  name               = "cg-lambda-role-${var.cgid}-service-role"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -21,27 +21,33 @@ resource "aws_iam_role" "cg-lambda-role" {
 }
 EOF
   tags = {
-    Name = "cg-lambda-role-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-lambda-role-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_lambda_function" "cg-lambda-function" {
-  filename = "../assets/lambda.zip"
-  function_name = "cg-lambda-${var.cgid}"
-  role = "${aws_iam_role.cg-lambda-role.arn}"
-  handler = "lambda.handler"
+  filename         = "../assets/lambda.zip"
+  function_name    = "cg-lambda-${var.cgid}"
+  role             = "${aws_iam_role.cg-lambda-role.arn}"
+  handler          = "lambda.handler"
   source_code_hash = "${data.archive_file.cg-lambda-function.output_base64sha256}"
-  runtime = "python3.6"
+  runtime          = "python3.6"
   environment {
-      variables = {
-          EC2_ACCESS_KEY_ID = "${aws_iam_access_key.cg-wrex.id}"
-          EC2_SECRET_KEY_ID = "${aws_iam_access_key.cg-wrex.secret}"
-      }
+    variables = {
+      EC2_ACCESS_KEY_ID = "${aws_iam_access_key.cg-wrex.id}"
+      EC2_SECRET_KEY_ID = "${aws_iam_access_key.cg-wrex.secret}"
+    }
   }
   tags = {
-    Name = "cg-lambda-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-lambda-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
\ No newline at end of file
diff --git a/scenarios/ec2_ssrf/terraform/s3.tf b/scenarios/ec2_ssrf/terraform/s3.tf
index 4c9e68df..fc42f1c6 100644
--- a/scenarios/ec2_ssrf/terraform/s3.tf
+++ b/scenarios/ec2_ssrf/terraform/s3.tf
@@ -7,23 +7,29 @@ locals {
 }
 
 resource "aws_s3_bucket" "cg-secret-s3-bucket" {
-  bucket = "cg-secret-s3-bucket-${local.bucket_suffix}"
-  acl = "private"
+  bucket        = "cg-secret-s3-bucket-${local.bucket_suffix}"
+  acl           = "private"
   force_destroy = true
   tags = {
-      Name = "cg-secret-s3-bucket-${local.bucket_suffix}"
-      Description = "CloudGoat ${var.cgid} S3 Bucket used for storing a secret"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name        = "cg-secret-s3-bucket-${local.bucket_suffix}"
+    Description = "CloudGoat ${var.cgid} S3 Bucket used for storing a secret"
+    Stack       = "${var.stack-name}"
+    Scenario    = "${var.scenario-name}"
+    git_org     = "LironElbaz"
+    git_repo    = "cloudgoat"
+    yor_trace   = "yor_trace"
   }
 }
 resource "aws_s3_bucket_object" "cg-shepards-credentials" {
   bucket = "${aws_s3_bucket.cg-secret-s3-bucket.id}"
-  key = "admin-user.txt"
+  key    = "admin-user.txt"
   source = "../assets/admin-user.txt"
   tags = {
-    Name = "cg-shepards-credentials-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-shepards-credentials-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
\ No newline at end of file
diff --git a/scenarios/ec2_ssrf/terraform/vpc.tf b/scenarios/ec2_ssrf/terraform/vpc.tf
index a561d209..3c99f420 100644
--- a/scenarios/ec2_ssrf/terraform/vpc.tf
+++ b/scenarios/ec2_ssrf/terraform/vpc.tf
@@ -1,61 +1,76 @@
 resource "aws_vpc" "cg-vpc" {
-  cidr_block = "10.10.0.0/16"
+  cidr_block           = "10.10.0.0/16"
   enable_dns_hostnames = true
   tags = {
-      Name = "CloudGoat ${var.cgid} VPC"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} VPC"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Internet Gateway
 resource "aws_internet_gateway" "cg-internet-gateway" {
   vpc_id = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat ${var.cgid} Internet Gateway"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} Internet Gateway"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Public Subnets
 resource "aws_subnet" "cg-public-subnet-1" {
   availability_zone = "${var.region}a"
-  cidr_block = "10.10.10.0/24"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  cidr_block        = "10.10.10.0/24"
+  vpc_id            = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat ${var.cgid} Public Subnet #1"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} Public Subnet #1"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_subnet" "cg-public-subnet-2" {
   availability_zone = "${var.region}b"
-  cidr_block = "10.10.20.0/24"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  cidr_block        = "10.10.20.0/24"
+  vpc_id            = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat ${var.cgid} Public Subnet #2"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} Public Subnet #2"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Public Subnet Routing Table
 resource "aws_route_table" "cg-public-subnet-route-table" {
   route {
-      cidr_block = "0.0.0.0/0"
-      gateway_id = "${aws_internet_gateway.cg-internet-gateway.id}"
+    cidr_block = "0.0.0.0/0"
+    gateway_id = "${aws_internet_gateway.cg-internet-gateway.id}"
   }
   vpc_id = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat ${var.cgid} Route Table for Public Subnet"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} Route Table for Public Subnet"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Public Subnets Routing Associations
 resource "aws_route_table_association" "cg-public-subnet-1-route-association" {
-  subnet_id = "${aws_subnet.cg-public-subnet-1.id}"
+  subnet_id      = "${aws_subnet.cg-public-subnet-1.id}"
   route_table_id = "${aws_route_table.cg-public-subnet-route-table.id}"
 }
 resource "aws_route_table_association" "cg-public-subnet-2-route-association" {
-  subnet_id = "${aws_subnet.cg-public-subnet-2.id}"
+  subnet_id      = "${aws_subnet.cg-public-subnet-2.id}"
   route_table_id = "${aws_route_table.cg-public-subnet-route-table.id}"
 }
\ No newline at end of file
diff --git a/scenarios/ecs_efs_attack/terraform/ec2.tf b/scenarios/ecs_efs_attack/terraform/ec2.tf
index f56f3603..78ac477f 100644
--- a/scenarios/ecs_efs_attack/terraform/ec2.tf
+++ b/scenarios/ecs_efs_attack/terraform/ec2.tf
@@ -5,7 +5,7 @@
 resource "aws_iam_policy_attachment" "cg-ec2-ruse-role-policy-attachment" {
   name = "cg-ec2-ruse-role-policy-attachment-${var.cgid}"
   roles = [
-      "${aws_iam_role.cg-ec2-ruse-role.name}"
+    "${aws_iam_role.cg-ec2-ruse-role.name}"
   ]
   policy_arn = "${aws_iam_policy.cg-ec2-ruse-role-policy.arn}"
 }
@@ -13,7 +13,7 @@ resource "aws_iam_policy_attachment" "cg-ec2-ruse-role-policy-attachment" {
 resource "aws_iam_policy_attachment" "cg-efs-admin-role-policy-attachment" {
   name = "cg-efs-admin-role-policy-attachment-${var.cgid}"
   roles = [
-      "${aws_iam_role.cg-efs-admin-role.name}"
+    "${aws_iam_role.cg-efs-admin-role.name}"
   ]
   policy_arn = "${aws_iam_policy.cg-efs-admin-role-policy.arn}"
 }
@@ -21,8 +21,8 @@ resource "aws_iam_policy_attachment" "cg-efs-admin-role-policy-attachment" {
 resource "aws_iam_policy_attachment" "cg-ssm-mangaged" {
   name = "cg-cg-ssm-mangaged-role-policy-attachment-${var.cgid}"
   roles = [
-      "${aws_iam_role.cg-efs-admin-role.name}",
-      "${aws_iam_role.cg-ec2-ruse-role.name}"
+    "${aws_iam_role.cg-efs-admin-role.name}",
+    "${aws_iam_role.cg-ec2-ruse-role.name}"
   ]
   policy_arn = "arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore"
 }
@@ -33,123 +33,147 @@ resource "aws_iam_policy_attachment" "cg-ssm-mangaged" {
 resource "aws_iam_instance_profile" "cg-ec2-ruse-instance-profile" {
   name = "cg-ecsTaskExecutionRole-instance-profile-${var.cgid}"
   role = "${aws_iam_role.cg-ec2-ruse-role.name}"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 resource "aws_iam_instance_profile" "cg-efs-admin-instance-profile" {
   name = "cg-efs-admin-instance-profile-${var.cgid}"
   role = "${aws_iam_role.cg-efs-admin-role.name}"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 # Security Groups
 resource "aws_security_group" "cg-ec2-ssh-security-group" {
-  name = "cg-ec2-ssh-${var.cgid}"
+  name        = "cg-ec2-ssh-${var.cgid}"
   description = "CloudGoat ${var.cgid} Security Group for EC2 Instance over SSH"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  vpc_id      = "${aws_vpc.cg-vpc.id}"
   ingress {
-      from_port = 22
-      to_port = 22
-      protocol = "tcp"
-      cidr_blocks = var.cg_whitelist
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = var.cg_whitelist
   }
   egress {
-      from_port = 0
-      to_port = 0
-      protocol = "-1"
-      cidr_blocks = [
-          "0.0.0.0/0"
-      ]
+    from_port = 0
+    to_port   = 0
+    protocol  = "-1"
+    cidr_blocks = [
+      "0.0.0.0/0"
+    ]
   }
   tags = {
-    Name = "cg-ec2-ssh-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-ec2-ssh-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 
 
 resource "aws_security_group" "cg-ec2-efs-security-group" {
-  name = "cg-ec2-efs-${var.cgid}"
+  name        = "cg-ec2-efs-${var.cgid}"
   description = "CloudGoat ${var.cgid} Security Group for EFS"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  vpc_id      = "${aws_vpc.cg-vpc.id}"
   ingress {
-      from_port = 2049
-      to_port = 2049
-      protocol = "tcp"
-      cidr_blocks = [
-          "0.0.0.0/0"
-      ]
+    from_port = 2049
+    to_port   = 2049
+    protocol  = "tcp"
+    cidr_blocks = [
+      "0.0.0.0/0"
+    ]
   }
   egress {
-      from_port = 0
-      to_port = 0
-      protocol = "-1"
-      cidr_blocks = [
-          "0.0.0.0/0"
-      ]
+    from_port = 0
+    to_port   = 0
+    protocol  = "-1"
+    cidr_blocks = [
+      "0.0.0.0/0"
+    ]
   }
   tags = {
-    Name = "cg-ec2-efs-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-ec2-efs-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 
 
 resource "aws_security_group" "cg-ec2-http-listener-security-group" {
-  name = "cg-ec2-http-${var.cgid}"
+  name        = "cg-ec2-http-${var.cgid}"
   description = "CloudGoat ${var.cgid} Security Group for http server"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  vpc_id      = "${aws_vpc.cg-vpc.id}"
   ingress {
-      from_port = 8080
-      to_port = 8080
-      protocol = "tcp"
-      cidr_blocks = [
-          "0.0.0.0/0"
-      ]
+    from_port = 8080
+    to_port   = 8080
+    protocol  = "tcp"
+    cidr_blocks = [
+      "0.0.0.0/0"
+    ]
   }
   egress {
-      from_port = 0
-      to_port = 0
-      protocol = "-1"
-      cidr_blocks = [
-          "0.0.0.0/0"
-      ]
+    from_port = 0
+    to_port   = 0
+    protocol  = "-1"
+    cidr_blocks = [
+      "0.0.0.0/0"
+    ]
   }
   tags = {
-    Name = "cg-ec2-http-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-ec2-http-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 
 # AWS Key Pair
 resource "aws_key_pair" "cg-ec2-key-pair" {
-  key_name = "cg-ec2-key-pair-${var.cgid}"
+  key_name   = "cg-ec2-key-pair-${var.cgid}"
   public_key = "${file(var.ssh-public-key-for-ec2)}"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 # EC2 Instance "ruse-box"
 resource "aws_instance" "cg-ruse-ec2" {
-    ami = "ami-0a313d6098716f372"
-    instance_type = "t2.micro"
-    iam_instance_profile = "${aws_iam_instance_profile.cg-ec2-ruse-instance-profile.name}"
-    subnet_id = "${aws_subnet.cg-public-subnet-1.id}"
-    associate_public_ip_address = true
-    
-    # Open ssh to whitelist ip and 8080 extenally 
-    vpc_security_group_ids = [
-        "${aws_security_group.cg-ec2-ssh-security-group.id}",
-        "${aws_security_group.cg-ec2-http-listener-security-group.id}"
-    ]
-    key_name = "${aws_key_pair.cg-ec2-key-pair.key_name}"
-    root_block_device {
-        volume_type = "gp2"
-        volume_size = 8
-        delete_on_termination = true
-    }
+  ami                         = "ami-0a313d6098716f372"
+  instance_type               = "t2.micro"
+  iam_instance_profile        = "${aws_iam_instance_profile.cg-ec2-ruse-instance-profile.name}"
+  subnet_id                   = "${aws_subnet.cg-public-subnet-1.id}"
+  associate_public_ip_address = true
+
+  # Open ssh to whitelist ip and 8080 extenally 
+  vpc_security_group_ids = [
+    "${aws_security_group.cg-ec2-ssh-security-group.id}",
+    "${aws_security_group.cg-ec2-http-listener-security-group.id}"
+  ]
+  key_name = "${aws_key_pair.cg-ec2-key-pair.key_name}"
+  root_block_device {
+    volume_type           = "gp2"
+    volume_size           = 8
+    delete_on_termination = true
+  }
 
 
-    user_data = <<-EOF
+  user_data = <<-EOF
       #! /bin/bash
       sudo snap start amazon-ssm-agent  
       sudo apt-get update
@@ -160,41 +184,44 @@ resource "aws_instance" "cg-ruse-ec2" {
       curl "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb" -o "session-manager-plugin.deb"
       sudo dpkg -i session-manager-plugin.deb
       EOF
-   
-    volume_tags = {
-        Name = "CloudGoat ${var.cgid} EC2 Instance Root Device"
-        Stack = "${var.stack-name}"
-        Scenario = "${var.scenario-name}"
-    }
-    tags = {
-        Name = "cg-ruse-ec2-${var.cgid}"
-        Stack = "${var.stack-name}"
-        StartSession = "true"
-        Scenario = "${var.scenario-name}"
-    }
+
+  volume_tags = {
+    Name     = "CloudGoat ${var.cgid} EC2 Instance Root Device"
+    Stack    = "${var.stack-name}"
+    Scenario = "${var.scenario-name}"
+  }
+  tags = {
+    Name         = "cg-ruse-ec2-${var.cgid}"
+    Stack        = "${var.stack-name}"
+    StartSession = "true"
+    Scenario     = "${var.scenario-name}"
+    git_org      = "LironElbaz"
+    git_repo     = "cloudgoat"
+    yor_trace    = "yor_trace"
+  }
 }
 
 
 resource "aws_instance" "cg-dev-ec2" {
-    ami = "ami-0a313d6098716f372"
-    instance_type = "t2.micro"
-    iam_instance_profile = "${aws_iam_instance_profile.cg-efs-admin-instance-profile.name}"
-    subnet_id = "${aws_subnet.cg-public-subnet-1.id}"
-    associate_public_ip_address = true
-    
-    # Open port for efs 
-    vpc_security_group_ids = [
-        "${aws_security_group.cg-ec2-efs-security-group.id}"
-    ]
+  ami                         = "ami-0a313d6098716f372"
+  instance_type               = "t2.micro"
+  iam_instance_profile        = "${aws_iam_instance_profile.cg-efs-admin-instance-profile.name}"
+  subnet_id                   = "${aws_subnet.cg-public-subnet-1.id}"
+  associate_public_ip_address = true
+
+  # Open port for efs 
+  vpc_security_group_ids = [
+    "${aws_security_group.cg-ec2-efs-security-group.id}"
+  ]
 
-    root_block_device {
-        volume_type = "gp2"
-        volume_size = 8
-        delete_on_termination = true
-    }
+  root_block_device {
+    volume_type           = "gp2"
+    volume_size           = 8
+    delete_on_termination = true
+  }
 
 
-    user_data = <<-EOF
+  user_data = <<-EOF
       #! /bin/bash
       sudo snap start amazon-ssm-agent  
       sudo apt-get update
@@ -206,16 +233,19 @@ resource "aws_instance" "cg-dev-ec2" {
       sudo apt install nmap
 
       EOF
-   
-    volume_tags = {
-        Name = "CloudGoat ${var.cgid} EC2 Instance Root Device"
-        Stack = "${var.stack-name}"
-        Scenario = "${var.scenario-name}"
-    }
-    tags = {
-        Name = "cg-admin-ec2-${var.cgid}"
-        Stack = "${var.stack-name}"
-        StartSession = "false"
-        Scenario = "${var.scenario-name}"
-    }
+
+  volume_tags = {
+    Name     = "CloudGoat ${var.cgid} EC2 Instance Root Device"
+    Stack    = "${var.stack-name}"
+    Scenario = "${var.scenario-name}"
+  }
+  tags = {
+    Name         = "cg-admin-ec2-${var.cgid}"
+    Stack        = "${var.stack-name}"
+    StartSession = "false"
+    Scenario     = "${var.scenario-name}"
+    git_org      = "LironElbaz"
+    git_repo     = "cloudgoat"
+    yor_trace    = "yor_trace"
+  }
 }
diff --git a/scenarios/ecs_efs_attack/terraform/ecs.tf b/scenarios/ecs_efs_attack/terraform/ecs.tf
index d5776425..c8242ae9 100644
--- a/scenarios/ecs_efs_attack/terraform/ecs.tf
+++ b/scenarios/ecs_efs_attack/terraform/ecs.tf
@@ -1,16 +1,21 @@
 resource "aws_ecs_cluster" "cg-cluster" {
-    name = "cg-cluster-${var.cgid}"
+  name = "cg-cluster-${var.cgid}"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 
 resource "aws_ecs_task_definition" "cg-webapp" {
-  family = "webapp"
+  family                   = "webapp"
   requires_compatibilities = ["FARGATE"]
   network_mode             = "awsvpc"
   cpu                      = "256"
   memory                   = "512"
-  task_role_arn = "${aws_iam_role.cg-ecs-role.arn}"
-  execution_role_arn = "${aws_iam_role.cg-ecs-role.arn}"
+  task_role_arn            = "${aws_iam_role.cg-ecs-role.arn}"
+  execution_role_arn       = "${aws_iam_role.cg-ecs-role.arn}"
 
   container_definitions = <<DEFINITION
 [
@@ -38,11 +43,21 @@ resource "aws_ecs_task_definition" "cg-webapp" {
   }
 ]
 DEFINITION
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 
 data "aws_ecs_task_definition" "cg-webapp" {
   task_definition = "${aws_ecs_task_definition.cg-webapp.family}"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 resource "aws_ecs_service" "cg-webapp" {
@@ -51,47 +66,55 @@ resource "aws_ecs_service" "cg-webapp" {
   desired_count = 1
   launch_type   = "FARGATE"
 
- network_configuration  {
-    security_groups = [aws_security_group.cg-ecs-http-security-group.id]
-    subnets         = ["${aws_subnet.cg-public-subnet-1.id}"]
+  network_configuration {
+    security_groups  = [aws_security_group.cg-ecs-http-security-group.id]
+    subnets          = ["${aws_subnet.cg-public-subnet-1.id}"]
     assign_public_ip = true
   }
 
   # Track the latest ACTIVE revision
   task_definition = "${aws_ecs_task_definition.cg-webapp.family}:${max("${aws_ecs_task_definition.cg-webapp.revision}", "${data.aws_ecs_task_definition.cg-webapp.revision}")}"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 
 resource "aws_iam_policy_attachment" "cg-ecs-role-policy-attachment" {
   name = "cg-ecs-role-policy-attachment-${var.cgid}"
   roles = [
-      "${aws_iam_role.cg-ecs-role.name}"
+    "${aws_iam_role.cg-ecs-role.name}"
   ]
   policy_arn = "${aws_iam_policy.cg-ecs-role-policy.arn}"
 }
 
 
 resource "aws_security_group" "cg-ecs-http-security-group" {
-  name = "cg-ecs-http-${var.cgid}"
+  name        = "cg-ecs-http-${var.cgid}"
   description = "CloudGoat ${var.cgid} Security Group for ecs"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  vpc_id      = "${aws_vpc.cg-vpc.id}"
   ingress {
-      from_port = 80
-      to_port = 80
-      protocol = "tcp"
-      cidr_blocks = var.cg_whitelist
+    from_port   = 80
+    to_port     = 80
+    protocol    = "tcp"
+    cidr_blocks = var.cg_whitelist
   }
   egress {
-      from_port = 0
-      to_port = 0
-      protocol = "-1"
-      cidr_blocks = [
-          "0.0.0.0/0"
-      ]
+    from_port = 0
+    to_port   = 0
+    protocol  = "-1"
+    cidr_blocks = [
+      "0.0.0.0/0"
+    ]
   }
   tags = {
-    Name = "cg-ecs-http-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-ecs-http-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
\ No newline at end of file
diff --git a/scenarios/ecs_efs_attack/terraform/efs.tf b/scenarios/ecs_efs_attack/terraform/efs.tf
index 87061449..79c5d565 100644
--- a/scenarios/ecs_efs_attack/terraform/efs.tf
+++ b/scenarios/ecs_efs_attack/terraform/efs.tf
@@ -1,13 +1,16 @@
 resource "aws_efs_file_system" "admin-backup" {
   tags = {
-    Name = "cg-admin-backup-${var.cgid}"
+    Name      = "cg-admin-backup-${var.cgid}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 
 
 resource "aws_efs_mount_target" "alpha" {
-  file_system_id = "${aws_efs_file_system.admin-backup.id}"
-  subnet_id      = "${aws_subnet.cg-public-subnet-1.id}"
+  file_system_id  = "${aws_efs_file_system.admin-backup.id}"
+  subnet_id       = "${aws_subnet.cg-public-subnet-1.id}"
   security_groups = ["${aws_security_group.cg-ec2-efs-security-group.id}"]
 }
 
@@ -24,8 +27,13 @@ resource "aws_efs_access_point" "admin_access_point" {
     }
   }
 
-   posix_user {
+  posix_user {
     gid = 1000
     uid = 1000
   }
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
diff --git a/scenarios/ecs_efs_attack/terraform/iam.tf b/scenarios/ecs_efs_attack/terraform/iam.tf
index 9f787dc4..4f2d466f 100644
--- a/scenarios/ecs_efs_attack/terraform/iam.tf
+++ b/scenarios/ecs_efs_attack/terraform/iam.tf
@@ -2,7 +2,7 @@
 ###########  EC2 Roles ###############
 
 resource "aws_iam_role" "cg-ec2-ruse-role" {
-  name = "cg-ec2-role-${var.cgid}"
+  name               = "cg-ec2-role-${var.cgid}"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -19,9 +19,12 @@ resource "aws_iam_role" "cg-ec2-ruse-role" {
 }
 EOF
   tags = {
-      Name = "cg-ec2-role-${var.cgid}"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "cg-ec2-role-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 
@@ -29,7 +32,7 @@ EOF
 #IAM Admin Role
 
 resource "aws_iam_role" "cg-efs-admin-role" {
-  name = "cg-efs-admin-role-${var.cgid}"
+  name               = "cg-efs-admin-role-${var.cgid}"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -46,9 +49,12 @@ resource "aws_iam_role" "cg-efs-admin-role" {
 }
 EOF
   tags = {
-      Name = "cg-ec2-efsUser-role-${var.cgid}"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "cg-ec2-efsUser-role-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 
@@ -72,13 +78,18 @@ resource "aws_iam_role" "cg-lambda-role" {
   ]
 }
 EOF
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 #Iam Role Policy for ec2 "ruse-box"
 resource "aws_iam_policy" "cg-ec2-ruse-role-policy" {
-  name = "cg-ec2-ruse-role-policy-${var.cgid}"
+  name        = "cg-ec2-ruse-role-policy-${var.cgid}"
   description = "cg-ec2-ruse-role-policy-${var.cgid}"
-  policy = <<POLICY
+  policy      = <<POLICY
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -104,12 +115,17 @@ resource "aws_iam_policy" "cg-ec2-ruse-role-policy" {
     ]
 }
 POLICY
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 resource "aws_iam_policy" "cg-efs-admin-role-policy" {
-  name = "cg-efs-admin-role-policy-${var.cgid}"
+  name        = "cg-efs-admin-role-policy-${var.cgid}"
   description = "cg-efs-admin-role-policy-${var.cgid}"
-  policy = <<POLICY
+  policy      = <<POLICY
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -124,6 +140,11 @@ resource "aws_iam_policy" "cg-efs-admin-role-policy" {
     ]
 }
 POLICY
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 
@@ -133,7 +154,7 @@ POLICY
 
 #IAM Role
 resource "aws_iam_role" "cg-ecs-role" {
-  name = "cg-ecs-role-${var.cgid}"
+  name               = "cg-ecs-role-${var.cgid}"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -150,16 +171,19 @@ resource "aws_iam_role" "cg-ecs-role" {
 }
 EOF
   tags = {
-      Name = "cg-ecs-role-${var.cgid}"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "cg-ecs-role-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Iam Role Policy
 resource "aws_iam_policy" "cg-ecs-role-policy" {
-  name = "cg-ecs-role-policy-${var.cgid}"
+  name        = "cg-ecs-role-policy-${var.cgid}"
   description = "cg-ecs-role-policy-${var.cgid}"
-  policy = <<POLICY
+  policy      = <<POLICY
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -195,6 +219,11 @@ resource "aws_iam_policy" "cg-ecs-role-policy" {
     ]
 }
 POLICY
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 
diff --git a/scenarios/ecs_efs_attack/terraform/lambda.tf b/scenarios/ecs_efs_attack/terraform/lambda.tf
index c41f9b01..d550f63d 100644
--- a/scenarios/ecs_efs_attack/terraform/lambda.tf
+++ b/scenarios/ecs_efs_attack/terraform/lambda.tf
@@ -19,12 +19,12 @@ resource "aws_iam_role_policy_attachment" "cg-lambda-policy3" {
 # A lambda function connected to an EFS file system
 resource "aws_lambda_function" "efs_upload" {
 
-  filename      = "../assets/efs_upload.zip"
-  function_name = "cg-efs_upload-${var.cgid}"
-  role          = "${aws_iam_role.cg-lambda-role.arn}"
-  handler       = "lambda_function.lambda_handler"
+  filename         = "../assets/efs_upload.zip"
+  function_name    = "cg-efs_upload-${var.cgid}"
+  role             = "${aws_iam_role.cg-lambda-role.arn}"
+  handler          = "lambda_function.lambda_handler"
   source_code_hash = "${filebase64sha256("../assets/efs_upload.zip")}"
-  runtime = "python3.8"
+  runtime          = "python3.8"
 
   file_system_config {
     # EFS file system access point ARN
@@ -42,6 +42,11 @@ resource "aws_lambda_function" "efs_upload" {
   # Explicitly declare dependency on EFS mount target. 
   # When creating or updating Lambda functions, mount target must be in 'available' lifecycle state.
   depends_on = [aws_efs_mount_target.alpha, aws_efs_access_point.admin_access_point]
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 
@@ -54,12 +59,17 @@ resource "aws_cloudwatch_event_rule" "cg_insert_file_every_three_minutes" {
   name                = "cg_every_three_minutes_${var.cgid}"
   description         = "Fires every_three_minutes"
   schedule_expression = "rate(3 minutes)"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 resource "aws_cloudwatch_event_target" "cg_check_insert_file_every_three_minutes" {
   rule      = "${aws_cloudwatch_event_rule.cg_insert_file_every_three_minutes.name}"
   target_id = "lambda"
-  input = "{\"fname\": \"flag.txt\", \"text\":\"RmxhZzoge3todHRwczovL3lvdXR1LmJlL2RRdzR3OVdnWGNRfX0=\"}"
+  input     = "{\"fname\": \"flag.txt\", \"text\":\"RmxhZzoge3todHRwczovL3lvdXR1LmJlL2RRdzR3OVdnWGNRfX0=\"}"
   arn       = "${aws_lambda_function.efs_upload.arn}"
 }
 
@@ -73,7 +83,7 @@ resource "aws_lambda_permission" "allow_cloudwatch_to_call_insert_lambda" {
 
 # # Invoke the lambda function
 # data "aws_lambda_invocation" "efs_upload_invoke" {
-  
+
 #   depends_on = [aws_lambda_function.efs_upload, aws_efs_access_point.admin_access_point]
 #   function_name = "${aws_lambda_function.efs_upload.function_name}"
 
diff --git a/scenarios/ecs_efs_attack/terraform/vpc.tf b/scenarios/ecs_efs_attack/terraform/vpc.tf
index a561d209..3c99f420 100644
--- a/scenarios/ecs_efs_attack/terraform/vpc.tf
+++ b/scenarios/ecs_efs_attack/terraform/vpc.tf
@@ -1,61 +1,76 @@
 resource "aws_vpc" "cg-vpc" {
-  cidr_block = "10.10.0.0/16"
+  cidr_block           = "10.10.0.0/16"
   enable_dns_hostnames = true
   tags = {
-      Name = "CloudGoat ${var.cgid} VPC"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} VPC"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Internet Gateway
 resource "aws_internet_gateway" "cg-internet-gateway" {
   vpc_id = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat ${var.cgid} Internet Gateway"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} Internet Gateway"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Public Subnets
 resource "aws_subnet" "cg-public-subnet-1" {
   availability_zone = "${var.region}a"
-  cidr_block = "10.10.10.0/24"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  cidr_block        = "10.10.10.0/24"
+  vpc_id            = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat ${var.cgid} Public Subnet #1"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} Public Subnet #1"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_subnet" "cg-public-subnet-2" {
   availability_zone = "${var.region}b"
-  cidr_block = "10.10.20.0/24"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  cidr_block        = "10.10.20.0/24"
+  vpc_id            = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat ${var.cgid} Public Subnet #2"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} Public Subnet #2"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Public Subnet Routing Table
 resource "aws_route_table" "cg-public-subnet-route-table" {
   route {
-      cidr_block = "0.0.0.0/0"
-      gateway_id = "${aws_internet_gateway.cg-internet-gateway.id}"
+    cidr_block = "0.0.0.0/0"
+    gateway_id = "${aws_internet_gateway.cg-internet-gateway.id}"
   }
   vpc_id = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat ${var.cgid} Route Table for Public Subnet"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} Route Table for Public Subnet"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Public Subnets Routing Associations
 resource "aws_route_table_association" "cg-public-subnet-1-route-association" {
-  subnet_id = "${aws_subnet.cg-public-subnet-1.id}"
+  subnet_id      = "${aws_subnet.cg-public-subnet-1.id}"
   route_table_id = "${aws_route_table.cg-public-subnet-route-table.id}"
 }
 resource "aws_route_table_association" "cg-public-subnet-2-route-association" {
-  subnet_id = "${aws_subnet.cg-public-subnet-2.id}"
+  subnet_id      = "${aws_subnet.cg-public-subnet-2.id}"
   route_table_id = "${aws_route_table.cg-public-subnet-route-table.id}"
 }
\ No newline at end of file
diff --git a/scenarios/ecs_takeover/terraform/ec2.tf b/scenarios/ecs_takeover/terraform/ec2.tf
index 5a64a4c5..ecd6fde7 100644
--- a/scenarios/ecs_takeover/terraform/ec2.tf
+++ b/scenarios/ecs_takeover/terraform/ec2.tf
@@ -24,7 +24,10 @@ resource "aws_instance" "vulnsite" {
   subnet_id                   = aws_subnet.public.id
 
   tags = {
-    "Name" = "cg-${var.scenario-name}-${var.cgid}-vulnsite"
+    "Name"    = "cg-${var.scenario-name}-${var.cgid}-vulnsite"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 
@@ -38,6 +41,9 @@ resource "aws_instance" "vault" {
   subnet_id                   = aws_subnet.public.id
 
   tags = {
-    "Name" = "cg-${var.scenario-name}-${var.cgid}-vault"
+    "Name"    = "cg-${var.scenario-name}-${var.cgid}-vault"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
\ No newline at end of file
diff --git a/scenarios/ecs_takeover/terraform/ecs.tf b/scenarios/ecs_takeover/terraform/ecs.tf
index 430e59ce..f0336b7b 100644
--- a/scenarios/ecs_takeover/terraform/ecs.tf
+++ b/scenarios/ecs_takeover/terraform/ecs.tf
@@ -1,5 +1,10 @@
 resource "aws_ecs_cluster" "ecs_cluster" {
   name = "${var.scenario-name}-${var.cgid}-cluster"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 resource "aws_ecs_task_definition" "vault" {
@@ -21,6 +26,11 @@ resource "aws_ecs_task_definition" "vault" {
       ]
     }
   ])
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 // Hosts the role we want to use to force rescheduling
@@ -37,6 +47,11 @@ resource "aws_ecs_task_definition" "privd" {
       command   = ["sleep", "365d"]
     }
   ])
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 // Hosts website to container escape
@@ -72,6 +87,11 @@ resource "aws_ecs_task_definition" "vulnsite" {
     name      = "docker-socket"
     host_path = "/var/run/docker.sock"
   }
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 
@@ -85,6 +105,11 @@ resource "aws_ecs_service" "vulnsite" {
     type       = "memberOf"
     expression = "ec2InstanceId == ${aws_instance.vulnsite.id}"
   }
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 resource "aws_ecs_service" "privd" {
@@ -94,6 +119,11 @@ resource "aws_ecs_service" "privd" {
   force_new_deployment = true
   scheduling_strategy  = "DAEMON"
   desired_count        = 2
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 
@@ -128,4 +158,9 @@ resource "aws_ecs_service" "vault" {
       AWS_PROFILE        = var.profile
     }
   }
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
diff --git a/scenarios/ecs_takeover/terraform/iam.tf b/scenarios/ecs_takeover/terraform/iam.tf
index 6790b56c..94510d57 100644
--- a/scenarios/ecs_takeover/terraform/iam.tf
+++ b/scenarios/ecs_takeover/terraform/iam.tf
@@ -15,6 +15,11 @@ data "aws_iam_policy_document" "ecs_agent" {
 resource "aws_iam_role" "ecs_agent" {
   name               = "cg-${var.scenario-name}-${var.cgid}-ecs-agent"
   assume_role_policy = data.aws_iam_policy_document.ecs_agent.json
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 
@@ -26,6 +31,11 @@ resource "aws_iam_role_policy_attachment" "ecs_agent" {
 resource "aws_iam_instance_profile" "ecs_agent" {
   name = "cg-${var.scenario-name}-${var.cgid}-ecs-agent"
   role = aws_iam_role.ecs_agent.name
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 
@@ -51,6 +61,11 @@ resource "aws_iam_role" "privd" {
   name                = "cg-${var.scenario-name}-${var.cgid}-privd"
   assume_role_policy  = data.aws_iam_policy_document.ecs_tasks_role.json
   managed_policy_arns = [aws_iam_policy.privd.arn]
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 // Give the role read access to ecs and IAM permissions.
@@ -81,4 +96,9 @@ resource "aws_iam_policy" "privd" {
       },
     ]
   })
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
\ No newline at end of file
diff --git a/scenarios/ecs_takeover/terraform/vpc.tf b/scenarios/ecs_takeover/terraform/vpc.tf
index 1b4633e4..3c360825 100644
--- a/scenarios/ecs_takeover/terraform/vpc.tf
+++ b/scenarios/ecs_takeover/terraform/vpc.tf
@@ -4,7 +4,10 @@ resource "aws_vpc" "vpc" {
   enable_dns_hostnames = true
 
   tags = {
-    "Name" = "cg-${var.scenario-name}-${var.cgid}-main"
+    "Name"    = "cg-${var.scenario-name}-${var.cgid}-main"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 
@@ -12,7 +15,10 @@ resource "aws_internet_gateway" "internet_gateway" {
   vpc_id = aws_vpc.vpc.id
 
   tags = {
-    "Name" = "cg-${var.scenario-name}-${var.cgid}-main"
+    "Name"    = "cg-${var.scenario-name}-${var.cgid}-main"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 
@@ -22,7 +28,10 @@ resource "aws_subnet" "public" {
   cidr_block        = "10.0.1.0/24"
 
   tags = {
-    "Name" = "cg-${var.scenario-name}-${var.cgid}-public"
+    "Name"    = "cg-${var.scenario-name}-${var.cgid}-public"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 
@@ -35,7 +44,10 @@ resource "aws_route_table" "public" {
   }
 
   tags = {
-    "Name" = "cg-${var.scenario-name}-${var.cgid}-public"
+    "Name"    = "cg-${var.scenario-name}-${var.cgid}-public"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 
@@ -70,6 +82,9 @@ resource "aws_security_group" "ecs_sg" {
   }
 
   tags = {
-    "Name" = "cg-${var.scenario-name}-${var.cgid}-ecs-sg"
+    "Name"    = "cg-${var.scenario-name}-${var.cgid}-ecs-sg"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
\ No newline at end of file
diff --git a/scenarios/iam_privesc_by_attachment/terraform/ec2.tf b/scenarios/iam_privesc_by_attachment/terraform/ec2.tf
index f0ca6036..fb6c9f41 100644
--- a/scenarios/iam_privesc_by_attachment/terraform/ec2.tf
+++ b/scenarios/iam_privesc_by_attachment/terraform/ec2.tf
@@ -1,81 +1,90 @@
 #Security Groups
 resource "aws_security_group" "cg-ec2-ssh-security-group" {
-  name = "cg-ec2-ssh-${var.cgid}"
+  name        = "cg-ec2-ssh-${var.cgid}"
   description = "CloudGoat ${var.cgid} Security Group for EC2 Instance over SSH"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  vpc_id      = "${aws_vpc.cg-vpc.id}"
   ingress {
-      from_port = 22
-      to_port = 22
-      protocol = "tcp"
-      cidr_blocks = var.cg_whitelist
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = var.cg_whitelist
   }
   egress {
-      from_port = 0
-      to_port = 0
-      protocol = "-1"
-      cidr_blocks = [
-        "0.0.0.0/0"
-      ]
+    from_port = 0
+    to_port   = 0
+    protocol  = "-1"
+    cidr_blocks = [
+      "0.0.0.0/0"
+    ]
   }
   tags = {
-    Name = "cg-ec2-ssh-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-ec2-ssh-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_security_group" "cg-ec2-http-https-security-group" {
-  name = "cg-ec2-http-${var.cgid}"
+  name        = "cg-ec2-http-${var.cgid}"
   description = "CloudGoat ${var.cgid} Security Group for EC2 Instance over HTTP"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  vpc_id      = "${aws_vpc.cg-vpc.id}"
   ingress {
-    from_port = 80
-    to_port = 80
-    protocol = "tcp"
+    from_port   = 80
+    to_port     = 80
+    protocol    = "tcp"
     cidr_blocks = var.cg_whitelist
   }
   ingress {
-      from_port = 443
-      to_port = 443
-      protocol = "tcp"
-      cidr_blocks = var.cg_whitelist
+    from_port   = 443
+    to_port     = 443
+    protocol    = "tcp"
+    cidr_blocks = var.cg_whitelist
   }
   egress {
-      from_port = 0
-      to_port = 0
-      protocol = "-1"
-      cidr_blocks = [
-        "0.0.0.0/0"
-      ]
+    from_port = 0
+    to_port   = 0
+    protocol  = "-1"
+    cidr_blocks = [
+      "0.0.0.0/0"
+    ]
   }
   tags = {
-    Name = "cg-ec2-http-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-ec2-http-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #EC2 Instance
 resource "aws_instance" "cg-super-critical-security-server" {
-  ami = "ami-0a313d6098716f372"
-  instance_type = "t2.micro"
-  subnet_id = "${aws_subnet.cg-public-subnet.id}"
+  ami                         = "ami-0a313d6098716f372"
+  instance_type               = "t2.micro"
+  subnet_id                   = "${aws_subnet.cg-public-subnet.id}"
   associate_public_ip_address = true
   vpc_security_group_ids = [
-      "${aws_security_group.cg-ec2-ssh-security-group.id}",
-      "${aws_security_group.cg-ec2-http-https-security-group.id}"
+    "${aws_security_group.cg-ec2-ssh-security-group.id}",
+    "${aws_security_group.cg-ec2-http-https-security-group.id}"
   ]
   root_block_device {
-      volume_type = "gp2"
-      volume_size = 8
-      delete_on_termination = true
+    volume_type           = "gp2"
+    volume_size           = 8
+    delete_on_termination = true
   }
   volume_tags = {
-      Name = "CloudGoat ${var.cgid} EC2 Instance Root Device"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name     = "CloudGoat ${var.cgid} EC2 Instance Root Device"
+    Stack    = "${var.stack-name}"
+    Scenario = "${var.scenario-name}"
   }
   tags = {
-      Name = "CloudGoat ${var.cgid} super-critical-security-server EC2 Instance"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} super-critical-security-server EC2 Instance"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
\ No newline at end of file
diff --git a/scenarios/iam_privesc_by_attachment/terraform/iam.tf b/scenarios/iam_privesc_by_attachment/terraform/iam.tf
index f5500e26..8bec3d83 100644
--- a/scenarios/iam_privesc_by_attachment/terraform/iam.tf
+++ b/scenarios/iam_privesc_by_attachment/terraform/iam.tf
@@ -2,9 +2,12 @@
 resource "aws_iam_user" "cg-kerrigan" {
   name = "kerrigan"
   tags = {
-    Name = "cg-kerrigan-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-kerrigan-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_iam_access_key" "cg-kerrigan" {
@@ -12,9 +15,9 @@ resource "aws_iam_access_key" "cg-kerrigan" {
 }
 #IAM User Policies
 resource "aws_iam_policy" "cg-kerrigan-policy" {
-  name = "cg-kerrigan-policy"
+  name        = "cg-kerrigan-policy"
   description = "cg-kerrigan-policy"
-  policy = <<EOF
+  policy      = <<EOF
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -50,14 +53,19 @@ resource "aws_iam_policy" "cg-kerrigan-policy" {
     ]
 }
 EOF
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 resource "aws_iam_user_policy_attachment" "cg-kerrigan-attachment" {
-  user = "${aws_iam_user.cg-kerrigan.name}"
+  user       = "${aws_iam_user.cg-kerrigan.name}"
   policy_arn = "${aws_iam_policy.cg-kerrigan-policy.arn}"
 }
 # IAM Role for EC2 Mighty
 resource "aws_iam_role" "cg-ec2-mighty-role" {
-  name = "cg-ec2-mighty-role-${var.cgid}"
+  name               = "cg-ec2-mighty-role-${var.cgid}"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -73,14 +81,17 @@ resource "aws_iam_role" "cg-ec2-mighty-role" {
 }
 EOF
   tags = {
-      Name = "CloudGoat ${var.cgid} EC2 Mighty Role"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} EC2 Mighty Role"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 # IAM Role for EC2 Meek
 resource "aws_iam_role" "cg-ec2-meek-role" {
-  name = "cg-ec2-meek-role-${var.cgid}"
+  name               = "cg-ec2-meek-role-${var.cgid}"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -96,16 +107,19 @@ resource "aws_iam_role" "cg-ec2-meek-role" {
 }
 EOF
   tags = {
-      Name = "CloudGoat ${var.cgid} EC2 Meek Role"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} EC2 Meek Role"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #IAM Policy for EC2 Mighty
 resource "aws_iam_policy" "cg-ec2-mighty-policy" {
-  name = "cg-ec2-mighty-policy"
+  name        = "cg-ec2-mighty-policy"
   description = "cg-ec2-mighty-policy"
-  policy =  <<EOF
+  policy      = <<EOF
 {
   "Version": "2012-10-17",
   "Statement": [
@@ -119,12 +133,17 @@ resource "aws_iam_policy" "cg-ec2-mighty-policy" {
   ]
 }
 EOF
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 #IAM Policy for EC2 meek
 resource "aws_iam_policy" "cg-ec2-meek-policy" {
-  name = "cg-ec2-meek-policy"
+  name        = "cg-ec2-meek-policy"
   description = "cg-ec2-meek-policy"
-  policy =  <<EOF
+  policy      = <<EOF
 {
   "Version": "2012-10-17",
   "Statement": [
@@ -138,19 +157,29 @@ resource "aws_iam_policy" "cg-ec2-meek-policy" {
   ]
 }
 EOF
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 #IAM Role Policy Attachment for EC2 Mighty
 resource "aws_iam_role_policy_attachment" "cg-ec2-mighty-role-policy-attachment-ec2" {
-  role = "${aws_iam_role.cg-ec2-mighty-role.name}"
+  role       = "${aws_iam_role.cg-ec2-mighty-role.name}"
   policy_arn = "${aws_iam_policy.cg-ec2-mighty-policy.arn}"
 }
 #IAM Role Policy Attachment for EC2 Meek
 resource "aws_iam_role_policy_attachment" "cg-ec2-meek-role-policy-attachment-ec2" {
-  role = "${aws_iam_role.cg-ec2-meek-role.name}"
+  role       = "${aws_iam_role.cg-ec2-meek-role.name}"
   policy_arn = "${aws_iam_policy.cg-ec2-meek-policy.arn}"
 }
 #IAM Instance Profile for Meek EC2 instances
 resource "aws_iam_instance_profile" "cg-ec2-meek-instance-profile" {
   name = "cg-ec2-meek-instance-profile-${var.cgid}"
-  role="${aws_iam_role.cg-ec2-meek-role.name}"
+  role = "${aws_iam_role.cg-ec2-meek-role.name}"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
\ No newline at end of file
diff --git a/scenarios/iam_privesc_by_attachment/terraform/vpc.tf b/scenarios/iam_privesc_by_attachment/terraform/vpc.tf
index 8d0adc49..be42c207 100644
--- a/scenarios/iam_privesc_by_attachment/terraform/vpc.tf
+++ b/scenarios/iam_privesc_by_attachment/terraform/vpc.tf
@@ -1,49 +1,61 @@
 #VPC
 resource "aws_vpc" "cg-vpc" {
-  cidr_block = "10.0.0.0/16"
+  cidr_block           = "10.0.0.0/16"
   enable_dns_hostnames = true
   tags = {
-      Name = "CloudGoat ${var.cgid} VPC"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} VPC"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Internet Gateway
 resource "aws_internet_gateway" "cg-internet-gateway" {
   vpc_id = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat ${var.cgid} Internet Gateway"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} Internet Gateway"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Public Subnet
 resource "aws_subnet" "cg-public-subnet" {
-  availability_zone = "${var.region}a"
+  availability_zone       = "${var.region}a"
   map_public_ip_on_launch = true
-  cidr_block = "10.0.10.0/24"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  cidr_block              = "10.0.10.0/24"
+  vpc_id                  = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat ${var.cgid} Public Subnet"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} Public Subnet"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Public Subnet Routing Table
 resource "aws_route_table" "cg-public-subnet-route-table" {
   route {
-      cidr_block = "0.0.0.0/0"
-      gateway_id = "${aws_internet_gateway.cg-internet-gateway.id}"
+    cidr_block = "0.0.0.0/0"
+    gateway_id = "${aws_internet_gateway.cg-internet-gateway.id}"
   }
   vpc_id = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat ${var.cgid} Route Table for Public Subnet"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat ${var.cgid} Route Table for Public Subnet"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Public Subnet Routing Association
 resource "aws_route_table_association" "cg-public-subnet-route-association" {
-  subnet_id = "${aws_subnet.cg-public-subnet.id}"
+  subnet_id      = "${aws_subnet.cg-public-subnet.id}"
   route_table_id = "${aws_route_table.cg-public-subnet-route-table.id}"
 }
\ No newline at end of file
diff --git a/scenarios/iam_privesc_by_rollback/terraform/iam.tf b/scenarios/iam_privesc_by_rollback/terraform/iam.tf
index 978b827f..1b9cad47 100644
--- a/scenarios/iam_privesc_by_rollback/terraform/iam.tf
+++ b/scenarios/iam_privesc_by_rollback/terraform/iam.tf
@@ -2,9 +2,12 @@
 resource "aws_iam_user" "cg-raynor" {
   name = "raynor-${var.cgid}"
   tags = {
-    Name     = "cg-raynor-${var.cgid}"
-    Stack    = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-raynor-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 
@@ -17,6 +20,11 @@ resource "aws_iam_policy" "cg-raynor-policy" {
   name        = "cg-raynor-policy-${var.cgid}"
   description = "cg-raynor-policy"
   policy      = "${file("../assets/policies/v1.json")}"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 #IAM Policy Attachments
diff --git a/scenarios/lambda_privesc/terraform/iam.tf b/scenarios/lambda_privesc/terraform/iam.tf
index f87ad59c..8188ab93 100644
--- a/scenarios/lambda_privesc/terraform/iam.tf
+++ b/scenarios/lambda_privesc/terraform/iam.tf
@@ -2,9 +2,12 @@
 resource "aws_iam_user" "cg-chris" {
   name = "chris-${var.cgid}"
   tags = {
-    Name     = "cg-chris-${var.cgid}"
-    Stack    = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-chris-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 
@@ -14,7 +17,7 @@ resource "aws_iam_access_key" "cg-chris" {
 
 # IAM roles
 resource "aws_iam_role" "cg-lambdaManager-role" {
-  name = "cg-lambdaManager-role-${var.cgid}"
+  name               = "cg-lambdaManager-role-${var.cgid}"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -31,14 +34,17 @@ resource "aws_iam_role" "cg-lambdaManager-role" {
 }
 EOF
   tags = {
-    Name = "cg-debug-role-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-debug-role-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 
 resource "aws_iam_role" "cg-debug-role" {
-  name = "cg-debug-role-${var.cgid}"
+  name               = "cg-debug-role-${var.cgid}"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -55,17 +61,20 @@ resource "aws_iam_role" "cg-debug-role" {
 }
 EOF
   tags = {
-    Name = "cg-debug-role-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-debug-role-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 
 # IAM Policies
 resource "aws_iam_policy" "cg-lambdaManager-policy" {
-  name = "cg-lambdaManager-policy-${var.cgid}"
+  name        = "cg-lambdaManager-policy-${var.cgid}"
   description = "cg-lambdaManager-policy-${var.cgid}"
-  policy =<<EOF
+  policy      = <<EOF
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -81,12 +90,17 @@ resource "aws_iam_policy" "cg-lambdaManager-policy" {
     ]
 }
 EOF
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 resource "aws_iam_policy" "cg-chris-policy" {
-  name = "cg-chris-policy-${var.cgid}"
+  name        = "cg-chris-policy-${var.cgid}"
   description = "cg-chris-policy-${var.cgid}"
-  policy =<<EOF
+  policy      = <<EOF
 {
     "Version": "2012-10-17",
     "Statement": [
@@ -103,20 +117,25 @@ resource "aws_iam_policy" "cg-chris-policy" {
     ]
 }
 EOF
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 
 #Policy Attachments
 resource "aws_iam_role_policy_attachment" "cg-debug-role-attachment" {
-  role = aws_iam_role.cg-debug-role.name
+  role       = aws_iam_role.cg-debug-role.name
   policy_arn = data.aws_iam_policy.administrator-full-access.arn
 }
 
 resource "aws_iam_role_policy_attachment" "cg-lambdaManager-role-attachment" {
-  role = aws_iam_role.cg-lambdaManager-role.name
+  role       = aws_iam_role.cg-lambdaManager-role.name
   policy_arn = aws_iam_policy.cg-lambdaManager-policy.arn
 }
 
 resource "aws_iam_user_policy_attachment" "cg-chris-attachment" {
-  user = aws_iam_user.cg-chris.name
+  user       = aws_iam_user.cg-chris.name
   policy_arn = aws_iam_policy.cg-chris-policy.arn
 }
\ No newline at end of file
diff --git a/scenarios/rce_web_app/terraform/ec2.tf b/scenarios/rce_web_app/terraform/ec2.tf
index 42fbab45..2640a3ac 100644
--- a/scenarios/rce_web_app/terraform/ec2.tf
+++ b/scenarios/rce_web_app/terraform/ec2.tf
@@ -1,6 +1,6 @@
 #IAM Role
 resource "aws_iam_role" "cg-ec2-role" {
-  name = "cg-ec2-role-${var.cgid}"
+  name               = "cg-ec2-role-${var.cgid}"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -17,21 +17,24 @@ resource "aws_iam_role" "cg-ec2-role" {
 }
 EOF
   tags = {
-      Name = "cg-ec2-role-${var.cgid}"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "cg-ec2-role-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #IAM Role Policy Attachment
 resource "aws_iam_role_policy_attachment" "cg-ec2-role-policy-attachment-s3" {
-  role = "${aws_iam_role.cg-ec2-role.name}"
+  role       = "${aws_iam_role.cg-ec2-role.name}"
   policy_arn = "${data.aws_iam_policy.s3-full-access.arn}"
 }
 #IAM Policy for EC2-RDS
 resource "aws_iam_policy" "cg-ec2-rds-policy" {
-  name = "cg-ec2-rds-policy"
+  name        = "cg-ec2-rds-policy"
   description = "cg-ec2-rds-policy"
-  policy =  <<EOF
+  policy      = <<EOF
 {
   "Version": "2012-10-17",
   "Statement": [
@@ -46,101 +49,122 @@ resource "aws_iam_policy" "cg-ec2-rds-policy" {
   ]
 }
 EOF
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 #IAM Role Policy Attachment
 resource "aws_iam_role_policy_attachment" "cg-ec2-role-policy-attachment-rds" {
-  role = "${aws_iam_role.cg-ec2-role.name}"
+  role       = "${aws_iam_role.cg-ec2-role.name}"
   policy_arn = "${aws_iam_policy.cg-ec2-rds-policy.arn}"
 }
 #IAM Instance Profile
 resource "aws_iam_instance_profile" "cg-ec2-instance-profile" {
   name = "cg-ec2-instance-profile-${var.cgid}"
   role = "${aws_iam_role.cg-ec2-role.name}"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 #Security Groups
 resource "aws_security_group" "cg-ec2-ssh-security-group" {
-  name = "cg-ec2-ssh-${var.cgid}"
+  name        = "cg-ec2-ssh-${var.cgid}"
   description = "CloudGoat ${var.cgid} Security Group for EC2 Instance over SSH"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  vpc_id      = "${aws_vpc.cg-vpc.id}"
   ingress {
-      from_port = 22
-      to_port = 22
-      protocol = "tcp"
-      cidr_blocks = var.cg_whitelist
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = var.cg_whitelist
   }
   egress {
-      from_port = 0
-      to_port = 0
-      protocol = "-1"
-      cidr_blocks = [
-        "0.0.0.0/0"
-      ]
+    from_port = 0
+    to_port   = 0
+    protocol  = "-1"
+    cidr_blocks = [
+      "0.0.0.0/0"
+    ]
   }
   tags = {
-    Name = "cg-ec2-ssh-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-ec2-ssh-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_security_group" "cg-ec2-http-security-group" {
-  name = "cg-ec2-http-${var.cgid}"
+  name        = "cg-ec2-http-${var.cgid}"
   description = "CloudGoat ${var.cgid} Security Group for EC2 Instance over HTTP"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  vpc_id      = "${aws_vpc.cg-vpc.id}"
   ingress {
-      from_port = 9000
-      to_port = 9000
-      protocol = "tcp"
-      security_groups = [
-          "${aws_security_group.cg-lb-http-security-group.id}"
-      ]
+    from_port = 9000
+    to_port   = 9000
+    protocol  = "tcp"
+    security_groups = [
+      "${aws_security_group.cg-lb-http-security-group.id}"
+    ]
   }
   egress {
-      from_port = 0
-      to_port = 0
-      protocol = "-1"
-      security_groups = [
-          "${aws_security_group.cg-lb-http-security-group.id}"
-      ]
+    from_port = 0
+    to_port   = 0
+    protocol  = "-1"
+    security_groups = [
+      "${aws_security_group.cg-lb-http-security-group.id}"
+    ]
   }
   tags = {
-    Name = "cg-ec2-http-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-ec2-http-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #AWS Key Pair
 resource "aws_key_pair" "cg-ec2-key-pair" {
-  key_name = "cg-ec2-key-pair-${var.cgid}"
+  key_name   = "cg-ec2-key-pair-${var.cgid}"
   public_key = "${file(var.ssh-public-key-for-ec2)}"
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 #EC2 Instance
 resource "aws_instance" "cg-ubuntu-ec2" {
-    ami = "ami-0a313d6098716f372"
-    instance_type = "t2.micro"
-    iam_instance_profile = "${aws_iam_instance_profile.cg-ec2-instance-profile.name}"
-    subnet_id = "${aws_subnet.cg-public-subnet-1.id}"
-    associate_public_ip_address = true
-    vpc_security_group_ids = [
-        "${aws_security_group.cg-ec2-ssh-security-group.id}",
-        "${aws_security_group.cg-ec2-http-security-group.id}"
-    ]
-    key_name = "${aws_key_pair.cg-ec2-key-pair.key_name}"
-    root_block_device {
-        volume_type = "gp2"
-        volume_size = 8
-        delete_on_termination = true
-    }
-    provisioner "file" {
-      source = "../assets/rce_app/app.zip"
-      destination = "/home/ubuntu/app.zip"
-      connection {
-        type = "ssh"
-        user = "ubuntu"
-        private_key = "${file(var.ssh-private-key-for-ec2)}"
-        host = self.public_ip
-      }
+  ami                         = "ami-0a313d6098716f372"
+  instance_type               = "t2.micro"
+  iam_instance_profile        = "${aws_iam_instance_profile.cg-ec2-instance-profile.name}"
+  subnet_id                   = "${aws_subnet.cg-public-subnet-1.id}"
+  associate_public_ip_address = true
+  vpc_security_group_ids = [
+    "${aws_security_group.cg-ec2-ssh-security-group.id}",
+    "${aws_security_group.cg-ec2-http-security-group.id}"
+  ]
+  key_name = "${aws_key_pair.cg-ec2-key-pair.key_name}"
+  root_block_device {
+    volume_type           = "gp2"
+    volume_size           = 8
+    delete_on_termination = true
+  }
+  provisioner "file" {
+    source      = "../assets/rce_app/app.zip"
+    destination = "/home/ubuntu/app.zip"
+    connection {
+      type        = "ssh"
+      user        = "ubuntu"
+      private_key = "${file(var.ssh-private-key-for-ec2)}"
+      host        = self.public_ip
     }
-    user_data = <<-EOF
+  }
+  user_data = <<-EOF
         #!/bin/bash
         apt-get update
         curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
@@ -156,14 +180,17 @@ resource "aws_instance" "cg-ubuntu-ec2" {
         node index.js &
         echo -e "\n* * * * * root node /home/ubuntu/app/index.js &\n* * * * * root sleep 10; curl GET http://${aws_lb.cg-lb.dns_name}/mkja1xijqf0abo1h9glg.html &\n* * * * * root sleep 10; node /home/ubuntu/app/index.js &\n* * * * * root sleep 20; node /home/ubuntu/app/index.js &\n* * * * * root sleep 30; node /home/ubuntu/app/index.js &\n* * * * * root sleep 40; node /home/ubuntu/app/index.js &\n* * * * * root sleep 50; node /home/ubuntu/app/index.js &\n" >> /etc/crontab
         EOF
-    volume_tags = {
-        Name = "CloudGoat ${var.cgid} EC2 Instance Root Device"
-        Stack = "${var.stack-name}"
-        Scenario = "${var.scenario-name}"
-    }
-    tags = {
-        Name = "cg-ubuntu-ec2-${var.cgid}"
-        Stack = "${var.stack-name}"
-        Scenario = "${var.scenario-name}"
-    }
+  volume_tags = {
+    Name     = "CloudGoat ${var.cgid} EC2 Instance Root Device"
+    Stack    = "${var.stack-name}"
+    Scenario = "${var.scenario-name}"
+  }
+  tags = {
+    Name      = "cg-ubuntu-ec2-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
diff --git a/scenarios/rce_web_app/terraform/iam.tf b/scenarios/rce_web_app/terraform/iam.tf
index 3637c255..b236cdfa 100644
--- a/scenarios/rce_web_app/terraform/iam.tf
+++ b/scenarios/rce_web_app/terraform/iam.tf
@@ -2,9 +2,12 @@
 resource "aws_iam_user" "cg-lara" {
   name = "lara"
   tags = {
-    Name = "cg-lara-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-lara-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_iam_access_key" "cg-lara" {
@@ -13,9 +16,12 @@ resource "aws_iam_access_key" "cg-lara" {
 resource "aws_iam_user" "cg-mcduck" {
   name = "McDuck"
   tags = {
-    Name = "cg-mcduck-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-mcduck-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_iam_access_key" "cg-mcduck" {
@@ -24,9 +30,9 @@ resource "aws_iam_access_key" "cg-mcduck" {
 
 #IAM User Policies
 resource "aws_iam_policy" "cg-lara-policy" {
-  name = "cg-lara-s3-policy"
+  name        = "cg-lara-s3-policy"
   description = "cg-lara-policy"
-  policy = <<EOF
+  policy      = <<EOF
 {
   "Version": "2012-10-17",
   "Statement": [
@@ -66,11 +72,16 @@ resource "aws_iam_policy" "cg-lara-policy" {
   ]
 }
 EOF
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 resource "aws_iam_policy" "cg-mcduck-policy" {
-  name = "cg-mcduck-s3-policy"
+  name        = "cg-mcduck-s3-policy"
   description = "cg-mcduck-policy"
-  policy = <<EOF
+  policy      = <<EOF
 {
   "Version": "2012-10-17",
   "Statement": [
@@ -109,13 +120,18 @@ resource "aws_iam_policy" "cg-mcduck-policy" {
   ]
 }
 EOF
+  tags = {
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
+  }
 }
 #IAM User Policy Attachments
 resource "aws_iam_user_policy_attachment" "cg-lara-attachment" {
-  user = "${aws_iam_user.cg-lara.name}"
+  user       = "${aws_iam_user.cg-lara.name}"
   policy_arn = "${aws_iam_policy.cg-lara-policy.arn}"
 }
 resource "aws_iam_user_policy_attachment" "cg-mcduck-attachment" {
-  user = "${aws_iam_user.cg-mcduck.name}"
+  user       = "${aws_iam_user.cg-mcduck.name}"
   policy_arn = "${aws_iam_policy.cg-mcduck-policy.arn}"
 }
\ No newline at end of file
diff --git a/scenarios/rce_web_app/terraform/lb.tf b/scenarios/rce_web_app/terraform/lb.tf
index 3f9d35a1..c49f2512 100644
--- a/scenarios/rce_web_app/terraform/lb.tf
+++ b/scenarios/rce_web_app/terraform/lb.tf
@@ -1,78 +1,87 @@
 #Security Groups
 resource "aws_security_group" "cg-lb-http-security-group" {
-  name = "cg-lb-http-${local.cgid_suffix}"
+  name        = "cg-lb-http-${local.cgid_suffix}"
   description = "CloudGoat ${var.cgid} Security Group for Application Load Balancer over HTTP"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  vpc_id      = "${aws_vpc.cg-vpc.id}"
   ingress {
-      from_port = 80
-      to_port = 80
-      protocol = "tcp"
-      cidr_blocks = var.cg_whitelist
+    from_port   = 80
+    to_port     = 80
+    protocol    = "tcp"
+    cidr_blocks = var.cg_whitelist
   }
   egress {
-      from_port = 0
-      to_port = 0
-      protocol = "-1"
-      cidr_blocks = [
-          "0.0.0.0/0"
-      ]
+    from_port = 0
+    to_port   = 0
+    protocol  = "-1"
+    cidr_blocks = [
+      "0.0.0.0/0"
+    ]
   }
   tags = {
-    Name = "cg-lb-http-${local.cgid_suffix}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-lb-http-${local.cgid_suffix}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Application Load Balancer
 resource "aws_lb" "cg-lb" {
-  name = "cg-lb-${local.cgid_suffix}"
-  internal = false
+  name               = "cg-lb-${local.cgid_suffix}"
+  internal           = false
   load_balancer_type = "application"
-  ip_address_type = "ipv4"
+  ip_address_type    = "ipv4"
   access_logs {
-      bucket = "${aws_s3_bucket.cg-logs-s3-bucket.bucket}"
-      prefix = "cg-lb-logs"
-      enabled = true
+    bucket  = "${aws_s3_bucket.cg-logs-s3-bucket.bucket}"
+    prefix  = "cg-lb-logs"
+    enabled = true
   }
   security_groups = [
-      "${aws_security_group.cg-lb-http-security-group.id}"
+    "${aws_security_group.cg-lb-http-security-group.id}"
   ]
   subnets = [
-      "${aws_subnet.cg-public-subnet-1.id}",
-      "${aws_subnet.cg-public-subnet-2.id}"
+    "${aws_subnet.cg-public-subnet-1.id}",
+    "${aws_subnet.cg-public-subnet-2.id}"
   ]
   tags = {
-      Name = "cg-lb-${var.cgid}"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "cg-lb-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Target Group
 resource "aws_lb_target_group" "cg-target-group" {
   # Note: the name cannot be more than 32 characters
-  name = "cg-tg-${local.cgid_suffix}"
-  port = 9000
-  protocol = "HTTP"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  name        = "cg-tg-${local.cgid_suffix}"
+  port        = 9000
+  protocol    = "HTTP"
+  vpc_id      = "${aws_vpc.cg-vpc.id}"
   target_type = "instance"
   tags = {
-    Name = "cg-target-group-${local.cgid_suffix}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-target-group-${local.cgid_suffix}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Target Group Attachment
 resource "aws_lb_target_group_attachment" "cg-target-group-attachment" {
   target_group_arn = "${aws_lb_target_group.cg-target-group.arn}"
-  target_id = "${aws_instance.cg-ubuntu-ec2.id}"
-  port = 9000
+  target_id        = "${aws_instance.cg-ubuntu-ec2.id}"
+  port             = 9000
 }
 #Load Balancer Listener
 resource "aws_lb_listener" "cg-lb-listener" {
   load_balancer_arn = "${aws_lb.cg-lb.arn}"
-  port = 80
+  port              = 80
   default_action {
-      type = "forward"
-      target_group_arn = "${aws_lb_target_group.cg-target-group.arn}"
+    type             = "forward"
+    target_group_arn = "${aws_lb_target_group.cg-target-group.arn}"
   }
 }
\ No newline at end of file
diff --git a/scenarios/rce_web_app/terraform/rds.tf b/scenarios/rce_web_app/terraform/rds.tf
index 18625bf1..d536101f 100644
--- a/scenarios/rce_web_app/terraform/rds.tf
+++ b/scenarios/rce_web_app/terraform/rds.tf
@@ -1,71 +1,80 @@
 #Security Group
 resource "aws_security_group" "cg-rds-security-group" {
-  name = "cg-rds-psql-${var.cgid}"
+  name        = "cg-rds-psql-${var.cgid}"
   description = "CloudGoat ${var.cgid} Security Group for PostgreSQL RDS Instance"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  vpc_id      = "${aws_vpc.cg-vpc.id}"
   ingress {
-      from_port = 5432
-      to_port = 5432
-      protocol = "tcp"
-      cidr_blocks = [
-          "10.0.10.0/24",
-          "10.0.20.0/24",
-          "10.0.30.0/24",
-          "10.0.40.0/24"
-      ]
+    from_port = 5432
+    to_port   = 5432
+    protocol  = "tcp"
+    cidr_blocks = [
+      "10.0.10.0/24",
+      "10.0.20.0/24",
+      "10.0.30.0/24",
+      "10.0.40.0/24"
+    ]
   }
   egress {
-      from_port = 0
-      to_port = 0
-      protocol = "-1"
-      cidr_blocks = [
-          "0.0.0.0/0"
-      ]
+    from_port = 0
+    to_port   = 0
+    protocol  = "-1"
+    cidr_blocks = [
+      "0.0.0.0/0"
+    ]
   }
   tags = {
-    Name = "cg-rds-psql-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-rds-psql-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #RDS Subnet Group
 resource "aws_db_subnet_group" "cg-rds-subnet-group" {
   name = "cloud-goat-rds-subnet-group-${var.cgid}"
   subnet_ids = [
-      "${aws_subnet.cg-private-subnet-1.id}",
-      "${aws_subnet.cg-private-subnet-2.id}"
+    "${aws_subnet.cg-private-subnet-1.id}",
+    "${aws_subnet.cg-private-subnet-2.id}"
   ]
   description = "CloudGoat ${var.cgid} Subnet Group"
   tags = {
-    Name = "cloud-goat-rds-subnet-group-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cloud-goat-rds-subnet-group-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #RDS PostgreSQL Instance
 resource "aws_db_instance" "cg-psql-rds" {
-  identifier = "cg-rds-instance-${local.cgid_suffix}"
-  engine = "postgres"
-  engine_version = "9.6"
-  port = "5432"
-  instance_class = "db.t2.micro"
+  identifier           = "cg-rds-instance-${local.cgid_suffix}"
+  engine               = "postgres"
+  engine_version       = "9.6"
+  port                 = "5432"
+  instance_class       = "db.t2.micro"
   db_subnet_group_name = "${aws_db_subnet_group.cg-rds-subnet-group.id}"
-  multi_az = false
-  username = "${var.rds-username}"
-  password = "${var.rds-password}"
-  publicly_accessible = false
+  multi_az             = false
+  username             = "${var.rds-username}"
+  password             = "${var.rds-password}"
+  publicly_accessible  = false
   vpc_security_group_ids = [
     "${aws_security_group.cg-rds-security-group.id}"
   ]
-  storage_type = "gp2"
-  allocated_storage = 20
-  name = "cloudgoat"
-  apply_immediately = true
+  storage_type        = "gp2"
+  allocated_storage   = 20
+  name                = "cloudgoat"
+  apply_immediately   = true
   skip_final_snapshot = true
 
   tags = {
-      Name = "cg-rds-instance-${var.cgid}"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "cg-rds-instance-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
\ No newline at end of file
diff --git a/scenarios/rce_web_app/terraform/s3.tf b/scenarios/rce_web_app/terraform/s3.tf
index e0fff43d..69068233 100644
--- a/scenarios/rce_web_app/terraform/s3.tf
+++ b/scenarios/rce_web_app/terraform/s3.tf
@@ -25,79 +25,100 @@ POLICY
 }
 #Logs S3 Bucket
 resource "aws_s3_bucket" "cg-logs-s3-bucket" {
-  bucket = "cg-logs-s3-bucket-${local.cgid_suffix}"
-  acl = "private"
+  bucket        = "cg-logs-s3-bucket-${local.cgid_suffix}"
+  acl           = "private"
   force_destroy = true
   tags = {
-      Name = "cg-logs-s3-bucket-${local.cgid_suffix}"
-      Description = "CloudGoat ${var.cgid} S3 Bucket used for ALB Logs"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name        = "cg-logs-s3-bucket-${local.cgid_suffix}"
+    Description = "CloudGoat ${var.cgid} S3 Bucket used for ALB Logs"
+    Stack       = "${var.stack-name}"
+    Scenario    = "${var.scenario-name}"
+    git_org     = "LironElbaz"
+    git_repo    = "cloudgoat"
+    yor_trace   = "yor_trace"
   }
 }
 #Secret S3 Bucket
 resource "aws_s3_bucket" "cg-secret-s3-bucket" {
-  bucket = "cg-secret-s3-bucket-${local.cgid_suffix}"
-  acl = "private"
+  bucket        = "cg-secret-s3-bucket-${local.cgid_suffix}"
+  acl           = "private"
   force_destroy = true
   tags = {
-      Name = "cg-secret-s3-bucket-${local.cgid_suffix}"
-      Description = "CloudGoat ${var.cgid} S3 Bucket used for storing a secret"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name        = "cg-secret-s3-bucket-${local.cgid_suffix}"
+    Description = "CloudGoat ${var.cgid} S3 Bucket used for storing a secret"
+    Stack       = "${var.stack-name}"
+    Scenario    = "${var.scenario-name}"
+    git_org     = "LironElbaz"
+    git_repo    = "cloudgoat"
+    yor_trace   = "yor_trace"
   }
 }
 #Keystore S3 Bucket
 resource "aws_s3_bucket" "cg-keystore-s3-bucket" {
-  bucket = "cg-keystore-s3-bucket-${local.cgid_suffix}"
-  acl = "private"
+  bucket        = "cg-keystore-s3-bucket-${local.cgid_suffix}"
+  acl           = "private"
   force_destroy = true
   tags = {
-    Name = "cg-keystore-s3-bucket-${local.cgid_suffix}"
+    Name        = "cg-keystore-s3-bucket-${local.cgid_suffix}"
     Description = "CloudGoat ${var.cgid} S3 Bucket used for storing ssh keys"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Stack       = "${var.stack-name}"
+    Scenario    = "${var.scenario-name}"
+    git_org     = "LironElbaz"
+    git_repo    = "cloudgoat"
+    yor_trace   = "yor_trace"
   }
 }
 
 #S3 Bucket Objects
 resource "aws_s3_bucket_object" "cg-lb-log-file" {
   bucket = "${aws_s3_bucket.cg-logs-s3-bucket.id}"
-  key = "cg-lb-logs/AWSLogs/${data.aws_caller_identity.aws-account-id.account_id}/elasticloadbalancing/${var.region}/2019/06/19/555555555555_elasticloadbalancing_us-east-1_app.cg-lb-cgidp347lhz47g.d36d4f13b73c2fe7_20190618T2140Z_10.10.10.100_5m9btchz.log"
+  key    = "cg-lb-logs/AWSLogs/${data.aws_caller_identity.aws-account-id.account_id}/elasticloadbalancing/${var.region}/2019/06/19/555555555555_elasticloadbalancing_us-east-1_app.cg-lb-cgidp347lhz47g.d36d4f13b73c2fe7_20190618T2140Z_10.10.10.100_5m9btchz.log"
   source = "../assets/555555555555_elasticloadbalancing_us-east-1_app.cg-lb-cgidp347lhz47g.d36d4f13b73c2fe7_20190618T2140Z_10.10.10.100_5m9btchz.log"
   tags = {
-    Name = "cg-lb-log-file-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-lb-log-file-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_s3_bucket_object" "cg-db-credentials-file" {
   bucket = "${aws_s3_bucket.cg-secret-s3-bucket.id}"
-  key = "db.txt"
+  key    = "db.txt"
   source = "../assets/db.txt"
   tags = {
-    Name = "cg-db-credentials-file-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-db-credentials-file-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_s3_bucket_object" "cg-ssh-private-key-file" {
   bucket = "${aws_s3_bucket.cg-keystore-s3-bucket.id}"
-  key = "cloudgoat"
+  key    = "cloudgoat"
   source = "${var.ssh-private-key-for-ec2}"
   tags = {
-    Name = "cg-ssh-private-key-file-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-ssh-private-key-file-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_s3_bucket_object" "cg-ssh-public-key-file" {
   bucket = "${aws_s3_bucket.cg-keystore-s3-bucket.id}"
-  key = "cloudgoat.pub"
+  key    = "cloudgoat.pub"
   source = "${var.ssh-public-key-for-ec2}"
   tags = {
-    Name = "cg-ssh-public-key-file-${var.cgid}"
-    Stack = "${var.stack-name}"
-    Scenario = "${var.scenario-name}"
+    Name      = "cg-ssh-public-key-file-${var.cgid}"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
\ No newline at end of file
diff --git a/scenarios/rce_web_app/terraform/vpc.tf b/scenarios/rce_web_app/terraform/vpc.tf
index cd28a304..04a82075 100644
--- a/scenarios/rce_web_app/terraform/vpc.tf
+++ b/scenarios/rce_web_app/terraform/vpc.tf
@@ -1,101 +1,125 @@
 #VPC
 resource "aws_vpc" "cg-vpc" {
-  cidr_block = "10.0.0.0/16"
+  cidr_block           = "10.0.0.0/16"
   enable_dns_hostnames = true
   tags = {
-      Name = "CloudGoat VPC"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat VPC"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Internet Gateway
 resource "aws_internet_gateway" "cg-internet-gateway" {
   vpc_id = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat Internet Gateway"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat Internet Gateway"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Public Subnets
 resource "aws_subnet" "cg-public-subnet-1" {
   availability_zone = "${var.region}a"
-  cidr_block = "10.0.10.0/24"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  cidr_block        = "10.0.10.0/24"
+  vpc_id            = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat Public Subnet #1"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat Public Subnet #1"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_subnet" "cg-public-subnet-2" {
   availability_zone = "${var.region}b"
-  cidr_block = "10.0.20.0/24"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  cidr_block        = "10.0.20.0/24"
+  vpc_id            = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat Public Subnet #2"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat Public Subnet #2"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Private Subnets
 resource "aws_subnet" "cg-private-subnet-1" {
   availability_zone = "${var.region}a"
-  cidr_block = "10.0.30.0/24"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  cidr_block        = "10.0.30.0/24"
+  vpc_id            = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat Private Subnet #1"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat Private Subnet #1"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 resource "aws_subnet" "cg-private-subnet-2" {
   availability_zone = "${var.region}b"
-  cidr_block = "10.0.40.0/24"
-  vpc_id = "${aws_vpc.cg-vpc.id}"
+  cidr_block        = "10.0.40.0/24"
+  vpc_id            = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat Private Subnet #2"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat Private Subnet #2"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Public Subnet Routing Table
 resource "aws_route_table" "cg-public-subnet-route-table" {
   route {
-      cidr_block = "0.0.0.0/0"
-      gateway_id = "${aws_internet_gateway.cg-internet-gateway.id}"
+    cidr_block = "0.0.0.0/0"
+    gateway_id = "${aws_internet_gateway.cg-internet-gateway.id}"
   }
   vpc_id = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat Route Table for Public Subnet"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat Route Table for Public Subnet"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Private Subnet Routing Table
 resource "aws_route_table" "cg-private-subnet-route-table" {
   vpc_id = "${aws_vpc.cg-vpc.id}"
   tags = {
-      Name = "CloudGoat Route Table for Private Subnet"
-      Stack = "${var.stack-name}"
-      Scenario = "${var.scenario-name}"
+    Name      = "CloudGoat Route Table for Private Subnet"
+    Stack     = "${var.stack-name}"
+    Scenario  = "${var.scenario-name}"
+    git_org   = "LironElbaz"
+    git_repo  = "cloudgoat"
+    yor_trace = "yor_trace"
   }
 }
 #Public Subnets Routing Associations
 resource "aws_route_table_association" "cg-public-subnet-1-route-association" {
-  subnet_id = "${aws_subnet.cg-public-subnet-1.id}"
+  subnet_id      = "${aws_subnet.cg-public-subnet-1.id}"
   route_table_id = "${aws_route_table.cg-public-subnet-route-table.id}"
 }
 resource "aws_route_table_association" "cg-public-subnet-2-route-association" {
-  subnet_id = "${aws_subnet.cg-public-subnet-2.id}"
+  subnet_id      = "${aws_subnet.cg-public-subnet-2.id}"
   route_table_id = "${aws_route_table.cg-public-subnet-route-table.id}"
 }
 #Private Subnets Routing Associations
 resource "aws_route_table_association" "cg-priate-subnet-1-route-association" {
-  subnet_id = "${aws_subnet.cg-private-subnet-1.id}"
+  subnet_id      = "${aws_subnet.cg-private-subnet-1.id}"
   route_table_id = "${aws_route_table.cg-private-subnet-route-table.id}"
 }
 resource "aws_route_table_association" "cg-priate-subnet-2-route-association" {
-  subnet_id = "${aws_subnet.cg-private-subnet-2.id}"
+  subnet_id      = "${aws_subnet.cg-private-subnet-2.id}"
   route_table_id = "${aws_route_table.cg-private-subnet-route-table.id}"
 }
\ No newline at end of file