diff --git a/lib/plugins/aws/deploy/lib/core-cf.json b/lib/plugins/aws/deploy/lib/core-cf.json
index 8e08677829d..f56019ea503 100644
--- a/lib/plugins/aws/deploy/lib/core-cf.json
+++ b/lib/plugins/aws/deploy/lib/core-cf.json
@@ -3,11 +3,25 @@
   "Description": "The AWS CloudFormation template for this Serverless application's resources outside of Lambdas and Api Gateway",
   "Resources": {
     "ServerlessDeploymentBucket": {
+      "Properties": {
+        "Tags": [
+          {
+            "Key": "yor_trace",
+            "Value": "d55e73c5-23e2-41b5-a8aa-81ba7e548221"
+          }
+        ]
+      },
       "Type" : "AWS::S3::Bucket"
     },
     "IamRoleLambda": {
       "Type": "AWS::IAM::Role",
       "Properties": {
+        "Tags": [
+          {
+            "Key": "yor_trace",
+            "Value": "fe506535-0a25-4eb0-8ba5-bc50ea48f068"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/lib/plugins/create/templates/aws-java-gradle/serverless.yml b/lib/plugins/create/templates/aws-java-gradle/serverless.yml
index 7f4f2717843..3e48ea05547 100644
--- a/lib/plugins/create/templates/aws-java-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-java-gradle/serverless.yml
@@ -33,6 +33,8 @@ package:
 functions:
   hello:
     handler: hello.Handler
+    tags:
+      yor_trace: eaac63b6-3958-4e09-806b-0c4ab0f6e315
 
 #   you can add any of the following events
 #   events:
diff --git a/lib/plugins/create/templates/aws-java-maven/serverless.yml b/lib/plugins/create/templates/aws-java-maven/serverless.yml
index cb9fa71d47a..a797242f3a9 100644
--- a/lib/plugins/create/templates/aws-java-maven/serverless.yml
+++ b/lib/plugins/create/templates/aws-java-maven/serverless.yml
@@ -33,6 +33,8 @@ package:
 functions:
   hello:
     handler: hello.Handler
+    tags:
+      yor_trace: 1660870c-8b54-4e96-900e-16f469afd74e
 
 #   you can add any of the following events
 #   events:
diff --git a/lib/plugins/create/templates/aws-nodejs/serverless.yml b/lib/plugins/create/templates/aws-nodejs/serverless.yml
index 1968b055f01..bbb7262e0bd 100644
--- a/lib/plugins/create/templates/aws-nodejs/serverless.yml
+++ b/lib/plugins/create/templates/aws-nodejs/serverless.yml
@@ -33,6 +33,8 @@ provider:
 functions:
   hello:
     handler: handler.hello
+    tags:
+      yor_trace: 13225a4e-2762-4be2-a93b-29d5d71a937f
 
 #   you can add any of the following events
 #   events:
diff --git a/lib/plugins/create/templates/aws-python/serverless.yml b/lib/plugins/create/templates/aws-python/serverless.yml
index cb3cd121d2e..b36e6c74a57 100644
--- a/lib/plugins/create/templates/aws-python/serverless.yml
+++ b/lib/plugins/create/templates/aws-python/serverless.yml
@@ -33,6 +33,8 @@ provider:
 functions:
   hello:
     handler: handler.hello
+    tags:
+      yor_trace: f99d3dec-ea9d-48c5-b033-7aca90ff989c
 
 #   you can add any of the following events
 #   events: