diff --git a/aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.19.zip b/aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.19.zip
deleted file mode 100644
index 0dc0a44b..00000000
Binary files a/aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.19.zip and /dev/null differ
diff --git a/aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.20.zip b/aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.20.zip
new file mode 100644
index 00000000..b7ebec0d
Binary files /dev/null and b/aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.20.zip differ
diff --git a/aws-observability/apps/alb/alb_app.template.yaml b/aws-observability/apps/alb/alb_app.template.yaml
index 34bc6545..153acea7 100755
--- a/aws-observability/apps/alb/alb_app.template.yaml
+++ b/aws-observability/apps/alb/alb_app.template.yaml
@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: 'AWS::Serverless-2016-10-31'
-Description: "Version - v2.10.0: Template to setup the ALB app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the ALB app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   'AWS::CloudFormation::Interface':
diff --git a/aws-observability/apps/apigateway/api_gateway_app.template.yaml b/aws-observability/apps/apigateway/api_gateway_app.template.yaml
index ba1c4b9c..663e54e1 100755
--- a/aws-observability/apps/apigateway/api_gateway_app.template.yaml
+++ b/aws-observability/apps/apigateway/api_gateway_app.template.yaml
@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: 'AWS::Serverless-2016-10-31'
-Description: "Version - v2.10.0: Template to setup the API Gateway app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the API Gateway app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   'AWS::CloudFormation::Interface':
diff --git a/aws-observability/apps/autoenable/auto_enable.template.yaml b/aws-observability/apps/autoenable/auto_enable.template.yaml
index c19bc4ea..b378a2e6 100644
--- a/aws-observability/apps/autoenable/auto_enable.template.yaml
+++ b/aws-observability/apps/autoenable/auto_enable.template.yaml
@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: 'AWS::Serverless-2016-10-31'
-Description: "Version - v2.10.0: Template to setup Auto Enable ALB Access Logging and Lambda Auto Subscribe Log Groups for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup Auto Enable ALB Access Logging and Lambda Auto Subscribe Log Groups for AWS Observability Solution."
 
 Parameters:
   SumoLogicResourceRemoveOnDeleteStack:
diff --git a/aws-observability/apps/cloudwatchmetrics/cloudwatchmetrics.template.yaml b/aws-observability/apps/cloudwatchmetrics/cloudwatchmetrics.template.yaml
index d3c380e8..09e1e0c1 100644
--- a/aws-observability/apps/cloudwatchmetrics/cloudwatchmetrics.template.yaml
+++ b/aws-observability/apps/cloudwatchmetrics/cloudwatchmetrics.template.yaml
@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: 'AWS::Serverless-2016-10-31'
-Description: "Version - v2.10.0: Template to Setup Sumo Logic CloudWatch Metric Source. The template setup CW Metrics Sources for Namespaces."
+Description: "Version - v2.11.0: Template to Setup Sumo Logic CloudWatch Metric Source. The template setup CW Metrics Sources for Namespaces."
 
 Parameters:
   SumoLogicDeployment:
@@ -55,6 +55,11 @@ Parameters:
     Description: "Provide a Source Category for CloudWatch Metrics Source"
     Default: ""
 
+  MetricsSourceAWSTagFilters:
+    Type: String
+    Description: "Provide JSON format of the namespaces with it's tags values for Metrics Source."
+    Default: ""
+
   CreateFirstMetricsSource:
     Type: String
     Description: "Select Yes if you would like to create the Metric Source."
@@ -165,6 +170,7 @@ Resources:
       SourceName: !Sub "${CloudWatchMetricsSourceName}-${FirstMetricsSourceNamespace}"
       ScanInterval: !FindInMap [Namespaces, !Ref FirstMetricsSourceNamespace, ScanInterval]
       SourceCategory: !Ref CloudWatchMetricSourceCategory
+      AWSTagFilters: !Ref MetricsSourceAWSTagFilters
       CollectorId: !Ref SumoLogicCollectorId
       SumoAccessID: !Ref SumoLogicAccessID
       SumoAccessKey: !Ref SumoLogicAccessKey
@@ -185,6 +191,7 @@ Resources:
       SourceName: !Sub "${CloudWatchMetricsSourceName}-${SecondMetricsSourceNamespace}"
       ScanInterval: !FindInMap [Namespaces, !Ref SecondMetricsSourceNamespace, ScanInterval]
       SourceCategory: !Ref CloudWatchMetricSourceCategory
+      AWSTagFilters: !Ref MetricsSourceAWSTagFilters
       CollectorId: !Ref SumoLogicCollectorId
       SumoAccessID: !Ref SumoLogicAccessID
       SumoAccessKey: !Ref SumoLogicAccessKey
@@ -205,6 +212,7 @@ Resources:
       SourceName: !Sub "${CloudWatchMetricsSourceName}-${ThirdMetricsSourceNamespace}"
       ScanInterval: !FindInMap [Namespaces, !Ref ThirdMetricsSourceNamespace, ScanInterval]
       SourceCategory: !Ref CloudWatchMetricSourceCategory
+      AWSTagFilters: !Ref MetricsSourceAWSTagFilters
       CollectorId: !Ref SumoLogicCollectorId
       SumoAccessID: !Ref SumoLogicAccessID
       SumoAccessKey: !Ref SumoLogicAccessKey
@@ -225,6 +233,7 @@ Resources:
       SourceName: !Sub "${CloudWatchMetricsSourceName}-${FourthMetricsSourceNamespace}"
       ScanInterval: !FindInMap [Namespaces, !Ref FourthMetricsSourceNamespace, ScanInterval]
       SourceCategory: !Ref CloudWatchMetricSourceCategory
+      AWSTagFilters: !Ref MetricsSourceAWSTagFilters
       CollectorId: !Ref SumoLogicCollectorId
       SumoAccessID: !Ref SumoLogicAccessID
       SumoAccessKey: !Ref SumoLogicAccessKey
@@ -245,6 +254,7 @@ Resources:
       SourceName: !Sub "${CloudWatchMetricsSourceName}-${FifthMetricsSourceNamespace}"
       ScanInterval: !FindInMap [Namespaces, !Ref FifthMetricsSourceNamespace, ScanInterval]
       SourceCategory: !Ref CloudWatchMetricSourceCategory
+      AWSTagFilters: !Ref MetricsSourceAWSTagFilters
       CollectorId: !Ref SumoLogicCollectorId
       SumoAccessID: !Ref SumoLogicAccessID
       SumoAccessKey: !Ref SumoLogicAccessKey
diff --git a/aws-observability/apps/common/resources.template.yaml b/aws-observability/apps/common/resources.template.yaml
index edb363a5..f25dceba 100755
--- a/aws-observability/apps/common/resources.template.yaml
+++ b/aws-observability/apps/common/resources.template.yaml
@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: 'AWS::Serverless-2016-10-31'
-Description: "Version - v2.10.0: Template to Setup Sumo Logic Sources and supporting AWS Resources for CloudTrail, ALB, Lambda CloudWatch Logs and CloudWatch Metrics."
+Description: "Version - v2.11.0: Template to Setup Sumo Logic Sources and supporting AWS Resources for CloudTrail, ALB, Lambda CloudWatch Logs and CloudWatch Metrics."
 
 Parameters:
   SumoLogicDeployment:
@@ -99,6 +99,10 @@ Parameters:
     Type: String
     Description: "Provide a source Category for the CloudWatch Metrics Source."
     Default: ""
+  MetricsSourceAWSTagFilters:
+    Type: String
+    Description: "Provide JSON format of the namespaces with it's tags values for Metrics Source."
+    Default: ""
 
   CreateKinesisFirehoseMetricsSource:
     Type: String
@@ -487,7 +491,7 @@ Resources:
       Description: "Lambda Function for deploying SumoLogic AWS Observability Solution."
       CodeUri:
         Bucket: !FindInMap [ RegionMap, !Ref 'AWS::Region', bucketname ]
-        Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.19.zip"
+        Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.20.zip"
       MemorySize: 128
       Timeout: 900
       Role:
@@ -1138,6 +1142,7 @@ Resources:
         SumoLogicSourceRole: !GetAtt SumoLogicSourceRole.Arn
         CloudWatchMetricsSourceName: !Ref CloudWatchMetricsSourceName
         CloudWatchMetricSourceCategory: !Ref CloudWatchMetricSourceCategory
+        MetricsSourceAWSTagFilters: !Ref MetricsSourceAWSTagFilters
         CreateFirstMetricsSource: !GetAtt Primerinvoke.ApplicationELB
         FirstMetricsSourceNamespace: "ApplicationELB"
         CreateSecondMetricsSource: !GetAtt Primerinvoke.ApiGateway
@@ -1165,6 +1170,7 @@ Resources:
         SumoLogicSourceRole: !GetAtt SumoLogicSourceRole.Arn
         CloudWatchMetricsSourceName: !Ref CloudWatchMetricsSourceName
         CloudWatchMetricSourceCategory: !Ref CloudWatchMetricSourceCategory
+        MetricsSourceAWSTagFilters: !Ref MetricsSourceAWSTagFilters
         CreateFirstMetricsSource: !GetAtt Primerinvoke.ECS
         FirstMetricsSourceNamespace: "ECS"
         CreateSecondMetricsSource: !GetAtt Primerinvoke.ElastiCache
@@ -1193,6 +1199,7 @@ Resources:
         SumoLogicSourceRole: !GetAtt SumoLogicSourceRole.Arn
         CloudWatchMetricsSourceName: !Ref CloudWatchMetricsSourceName
         CloudWatchMetricSourceCategory: !Ref CloudWatchMetricSourceCategory
+        MetricsSourceAWSTagFilters: !Ref MetricsSourceAWSTagFilters
         CreateFirstMetricsSource: !GetAtt Primerinvoke.SQS
         FirstMetricsSourceNamespace: "SQS"
         CreateSecondMetricsSource: !GetAtt Primerinvoke.SNS
@@ -1231,6 +1238,7 @@ Resources:
       SourceName: !Ref KinesisFirehoseMetricsSourceName
       RemoveOnDeleteStack: !Ref RemoveSumoLogicResourcesOnDeleteStack
       SourceCategory: !Ref KinesisFirehoseMetricSourceCategory
+      AWSTagFilters: !Ref MetricsSourceAWSTagFilters
       CollectorId: !GetAtt SumoLogicHostedCollector.COLLECTOR_ID
       SumoAccessID: !Ref SumoLogicAccessID
       SumoAccessKey: !Ref SumoLogicAccessKey
diff --git a/aws-observability/apps/controltower/controltower.template.yaml b/aws-observability/apps/controltower/controltower.template.yaml
index 0b8958ce..46a9a155 100644
--- a/aws-observability/apps/controltower/controltower.template.yaml
+++ b/aws-observability/apps/controltower/controltower.template.yaml
@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: AWS::Serverless-2016-10-31
-Description: "Version - v2.10.0: The Template should be deployed in Master account. This template setup the Lambda trigger for new account created using AWS Control Tower Account Factory process. The Lambda install the AWS Observability CF template on the regions of new AWS account using stack Sets."
+Description: "Version - v2.11.0: The Template should be deployed in Master account. This template setup the Lambda trigger for new account created using AWS Control Tower Account Factory process. The Lambda install the AWS Observability CF template on the regions of new AWS account using stack Sets."
 
 Globals:
   Function:
diff --git a/aws-observability/apps/dynamodb/dynamodb_app.template.yaml b/aws-observability/apps/dynamodb/dynamodb_app.template.yaml
index 7c714bc8..a5ced420 100755
--- a/aws-observability/apps/dynamodb/dynamodb_app.template.yaml
+++ b/aws-observability/apps/dynamodb/dynamodb_app.template.yaml
@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: 'AWS::Serverless-2016-10-31'
-Description: "Version - v2.10.0: Template to setup the DynamoDB app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the DynamoDB app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   'AWS::CloudFormation::Interface':
diff --git a/aws-observability/apps/ec2metrics/ec2_metrics_app.template.yaml b/aws-observability/apps/ec2metrics/ec2_metrics_app.template.yaml
index 68236225..59e069e1 100755
--- a/aws-observability/apps/ec2metrics/ec2_metrics_app.template.yaml
+++ b/aws-observability/apps/ec2metrics/ec2_metrics_app.template.yaml
@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: 'AWS::Serverless-2016-10-31'
-Description: "Version - v2.10.0: Template to setup the EC2 Metrics app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the EC2 Metrics app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   AWS::CloudFormation::Interface:
diff --git a/aws-observability/apps/ecs/ecs_app.template.yaml b/aws-observability/apps/ecs/ecs_app.template.yaml
index bf9cc116..c5d850c6 100755
--- a/aws-observability/apps/ecs/ecs_app.template.yaml
+++ b/aws-observability/apps/ecs/ecs_app.template.yaml
@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: 'AWS::Serverless-2016-10-31'
-Description: "Version - v2.10.0: Template to setup the ECS app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the ECS app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   'AWS::CloudFormation::Interface':
diff --git a/aws-observability/apps/elasticache/elasticache_app.template.yaml b/aws-observability/apps/elasticache/elasticache_app.template.yaml
index fe8c74df..e4d795a6 100755
--- a/aws-observability/apps/elasticache/elasticache_app.template.yaml
+++ b/aws-observability/apps/elasticache/elasticache_app.template.yaml
@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: 'AWS::Serverless-2016-10-31'
-Description: "Version - v2.10.0: Template to setup the ElastiCache app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the ElastiCache app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   'AWS::CloudFormation::Interface':
diff --git a/aws-observability/apps/elb/elb_app.template.yaml b/aws-observability/apps/elb/elb_app.template.yaml
index c0d2603f..53f939bb 100755
--- a/aws-observability/apps/elb/elb_app.template.yaml
+++ b/aws-observability/apps/elb/elb_app.template.yaml
@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: 'AWS::Serverless-2016-10-31'
-Description: "Version - v2.10.0: Template to setup the ELB classic app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the ELB classic app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   'AWS::CloudFormation::Interface':
diff --git a/aws-observability/apps/hostmetricsfields/host_metrics_add_fields.template.yaml b/aws-observability/apps/hostmetricsfields/host_metrics_add_fields.template.yaml
index 881abfea..d9889633 100644
--- a/aws-observability/apps/hostmetricsfields/host_metrics_add_fields.template.yaml
+++ b/aws-observability/apps/hostmetricsfields/host_metrics_add_fields.template.yaml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: "Version - v2.10.0: Lambda Function to add fields to host metrics sources based on the available instances in all regions of the current AWS account."
+Description: "Version - v2.11.0: Lambda Function to add fields to host metrics sources based on the available instances in all regions of the current AWS account."
 
 Metadata:
   'AWS::CloudFormation::Interface':
diff --git a/aws-observability/apps/lambda/lambda_app.template.yaml b/aws-observability/apps/lambda/lambda_app.template.yaml
index 190f27c9..693fc71d 100755
--- a/aws-observability/apps/lambda/lambda_app.template.yaml
+++ b/aws-observability/apps/lambda/lambda_app.template.yaml
@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: 'AWS::Serverless-2016-10-31'
-Description: "Version - v2.10.0: Template to setup the Lambda app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the Lambda app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   'AWS::CloudFormation::Interface':
diff --git a/aws-observability/apps/nlb/nlb_app.template.yaml b/aws-observability/apps/nlb/nlb_app.template.yaml
index 5c516210..a5dce6aa 100755
--- a/aws-observability/apps/nlb/nlb_app.template.yaml
+++ b/aws-observability/apps/nlb/nlb_app.template.yaml
@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: 'AWS::Serverless-2016-10-31'
-Description: "Version - v2.10.0: Template to setup the NLB app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the NLB app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   'AWS::CloudFormation::Interface':
diff --git a/aws-observability/apps/permissionchecker/permissioncheck.nested.template.test.yaml b/aws-observability/apps/permissionchecker/permissioncheck.nested.template.test.yaml
index 7593b1db..049277bf 100644
--- a/aws-observability/apps/permissionchecker/permissioncheck.nested.template.test.yaml
+++ b/aws-observability/apps/permissionchecker/permissioncheck.nested.template.test.yaml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: "Version - v2.10.0: This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template."
+Description: "Version - v2.11.0: This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template."
 Transform: 'AWS::Serverless-2016-10-31'
 
 Metadata:
diff --git a/aws-observability/apps/permissionchecker/permissioncheck.nested.template.yaml b/aws-observability/apps/permissionchecker/permissioncheck.nested.template.yaml
index a2d9af35..97dbdf99 100644
--- a/aws-observability/apps/permissionchecker/permissioncheck.nested.template.yaml
+++ b/aws-observability/apps/permissionchecker/permissioncheck.nested.template.yaml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: "Version - v2.10.0: This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template."
+Description: "Version - v2.11.0: This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template."
 Transform: 'AWS::Serverless-2016-10-31'
 
 Metadata:
diff --git a/aws-observability/apps/permissionchecker/permissioncheck.template.test.yaml b/aws-observability/apps/permissionchecker/permissioncheck.template.test.yaml
index b7bbb005..06a00c28 100644
--- a/aws-observability/apps/permissionchecker/permissioncheck.template.test.yaml
+++ b/aws-observability/apps/permissionchecker/permissioncheck.template.test.yaml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: "Version - v2.10.0: Note: Before deploying this template, please select the appropriate region. This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template."
+Description: "Version - v2.11.0: Note: Before deploying this template, please select the appropriate region. This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template."
 Transform: 'AWS::Serverless-2016-10-31'
 
 Metadata:
diff --git a/aws-observability/apps/permissionchecker/permissioncheck.template.yaml b/aws-observability/apps/permissionchecker/permissioncheck.template.yaml
index 839e2351..8bd1d888 100644
--- a/aws-observability/apps/permissionchecker/permissioncheck.template.yaml
+++ b/aws-observability/apps/permissionchecker/permissioncheck.template.yaml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: "Version - v2.10.0. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template."
+Description: "Version - v2.11.0. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template."
 Transform: 'AWS::Serverless-2016-10-31'
 
 Metadata:
diff --git a/aws-observability/apps/rds/rds_app.template.yaml b/aws-observability/apps/rds/rds_app.template.yaml
index 42a63d4e..eb623079 100755
--- a/aws-observability/apps/rds/rds_app.template.yaml
+++ b/aws-observability/apps/rds/rds_app.template.yaml
@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: 'AWS::Serverless-2016-10-31'
-Description: "Version - v2.10.0: Template to setup the RDS app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the RDS app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   'AWS::CloudFormation::Interface':
diff --git a/aws-observability/apps/rootcause/rootcauseexplorer.template.yaml b/aws-observability/apps/rootcause/rootcauseexplorer.template.yaml
index 0b2d2853..fb17be55 100755
--- a/aws-observability/apps/rootcause/rootcauseexplorer.template.yaml
+++ b/aws-observability/apps/rootcause/rootcauseexplorer.template.yaml
@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: 'AWS::Serverless-2016-10-31'
-Description: "Version - v2.10.0: Template to setup the Sumo Logic AWS Inventory Source and Root Cause Explorer app."
+Description: "Version - v2.11.0: Template to setup the Sumo Logic AWS Inventory Source and Root Cause Explorer app."
 
 Metadata:
   'AWS::CloudFormation::Interface':
diff --git a/aws-observability/apps/sns/sns_app.template.yaml b/aws-observability/apps/sns/sns_app.template.yaml
index dd13c547..2db988fa 100755
--- a/aws-observability/apps/sns/sns_app.template.yaml
+++ b/aws-observability/apps/sns/sns_app.template.yaml
@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: 'AWS::Serverless-2016-10-31'
-Description: "Version - v2.10.0: Template to setup the SNS app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the SNS app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   'AWS::CloudFormation::Interface':
diff --git a/aws-observability/apps/sqs/sqs_app.template.yaml b/aws-observability/apps/sqs/sqs_app.template.yaml
index 91f1e3ec..8ec51bb4 100755
--- a/aws-observability/apps/sqs/sqs_app.template.yaml
+++ b/aws-observability/apps/sqs/sqs_app.template.yaml
@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: '2010-09-09'
 Transform: 'AWS::Serverless-2016-10-31'
-Description: "Version - v2.10.0: Template to setup the SQS app with AWS and Sumo Logic resources for AWS Observability Solution."
+Description: "Version - v2.11.0: Template to setup the SQS app with AWS and Sumo Logic resources for AWS Observability Solution."
 
 Metadata:
   'AWS::CloudFormation::Interface':
diff --git a/aws-observability/scripts/JsonToS3.sh b/aws-observability/scripts/JsonToS3.sh
old mode 100644
new mode 100755
index 09a9d805..790f970d
--- a/aws-observability/scripts/JsonToS3.sh
+++ b/aws-observability/scripts/JsonToS3.sh
@@ -5,7 +5,7 @@ echo "Start S3 upload Script....."
 export AWS_PROFILE="prod"
 
 export bucket_name=sumologic-appdev-aws-sam-apps
-export version=v2.10.0
+export version=v2.11.0
 export match_case="App"
 
 if [[ ${AWS_PROFILE} == 'default' ]]
diff --git a/aws-observability/scripts/YamlToS3.sh b/aws-observability/scripts/YamlToS3.sh
index e2c33109..0c012325 100755
--- a/aws-observability/scripts/YamlToS3.sh
+++ b/aws-observability/scripts/YamlToS3.sh
@@ -50,7 +50,7 @@ fi
 # Upload all templates to sumologic-appdev-aws-sam-apps bucket with version information.
 if [[ ${AWS_PROFILE} == 'default' ]]
 then
-    export version=v2.10.0
+    export version=v2.11.0
 
     aws s3 cp apps/ s3://${bucket_name}/aws-observability-versions/${version}/ --recursive --include "*.template.yaml" --exclude '*.zip' --exclude '*.sh' --exclude 'apps/*/test/*' --exclude '*/test/*' --acl public-read --profile ${AWS_PROFILE}
 
diff --git a/aws-observability/templates/sumologic_observability.master.template.yaml b/aws-observability/templates/sumologic_observability.master.template.yaml
index 5d464f5f..949ec432 100644
--- a/aws-observability/templates/sumologic_observability.master.template.yaml
+++ b/aws-observability/templates/sumologic_observability.master.template.yaml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: "Version - v2.10.0. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will automate the setup of the AWS Observability Solution. For more information on each parameter, please see the AWS Observability Setup Guide: https://help.sumologic.com/Observability_Solution/AWS_Observability_Solution/01_Deploy_and_Use_AWS_Observability/05_Deploy_AWS_Observability"
+Description: "Version - v2.11.0. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will automate the setup of the AWS Observability Solution. For more information on each parameter, please see the AWS Observability Setup Guide: https://help.sumologic.com/Observability_Solution/AWS_Observability_Solution/01_Deploy_and_Use_AWS_Observability/05_Deploy_AWS_Observability"
 
 Metadata:
   'AWS::CloudFormation::Interface':
@@ -31,6 +31,7 @@ Metadata:
           - Section4aCreateMetricsSourceOptions
           - Section4bMetricsNameSpaces
           - Section4cCloudWatchExistingSourceAPIUrl
+          - Section4dAWSMetricsTagFilters
 
       - Label:
           default: "5. Sumo Logic AWS ALB Log Source"
@@ -106,6 +107,8 @@ Metadata:
         default: "Sumo Logic AWS Metrics Namespaces"
       Section4cCloudWatchExistingSourceAPIUrl:
         default: "Existing Sumo Logic Metrics Source API URL"
+      Section4dAWSMetricsTagFilters:
+        default: "Sumo Logic AWS Metrics Tag Filters"
 
       Section5aAutoEnableS3LogsALBResourcesOptions:
         default: "Enable ALB Access logging"
@@ -243,6 +246,11 @@ Parameters:
     Type: String
     Description: "Required when already collecting CloudWatch Metrics. Provide the existing Sumo Logic Metrics Source API URL. Account Field will be added to the Source. For Source API URL, visit https://help.sumologic.com/03Send-Data/Sources/03Use-JSON-to-Configure-Sources/Local-Configuration-File-Management/View-or-Download-Source-JSON-Configuration"
     Default: ""
+  Section4dAWSMetricsTagFilters:
+    Type: String
+    AllowedPattern: '^\{.*\}$'
+    Description: "Provide JSON format of the namespaces with it's tags values to add filters to your metrics. Use semicolons to separate multiple values for the same tag key. AWS Tag Filters will be added to the Source. For JSON format sample, visit https://help.sumologic.com/docs/observability/aws/deploy-use-aws-observability/deploy-with-aws-cloudformation/#step-5-sumo-logic-aws-cloudwatch-metrics-sources"
+    Default: "{}"
 
   Section5aAutoEnableS3LogsALBResourcesOptions:
     Type: String
@@ -635,30 +643,31 @@ Resources:
       scanInterval: 60
       ToUpdate: 
         Fn::Base64: !Sub
-          - "${a}-${b}-${c}-${d}-${e}-${f}-${g}-${h}-${i}-${j}-${k}-${l}-${m}-${n}-${o}-${p}-${q}-${r}-${s}-${t}-${u}-${v}-${w}"
+          - "${a}-${b}-${c}-${d}-${e}-${f}-${g}-${h}-${i}-${j}-${k}-${l}-${m}-${n}-${o}-${p}-${q}-${r}-${s}-${t}-${u}-${v}-${w}-${x}"
           - a: !Ref Section2aAccountAlias
             b: !Ref Section3aInstallObservabilityApps
             c: !Ref Section4aCreateMetricsSourceOptions
             d: !Ref Section4bMetricsNameSpaces
             e: !Ref Section4cCloudWatchExistingSourceAPIUrl
-            f: !Ref Section5aAutoEnableS3LogsALBResourcesOptions
-            g: !Ref Section5bALBCreateLogSource
-            h: !Ref Section5cALBLogsSourceUrl
-            i: !Ref Section5dALBS3LogsBucketName
-            j: !Ref Section6aCreateCloudTrailLogSource
-            k: !Ref Section6bCloudTrailLogsSourceUrl
-            l: !Ref Section6cCloudTrailLogsBucketName
-            m: !Ref Section7aLambdaCreateCloudWatchLogsSourceOptions
-            n: !Ref Section7bLambdaCloudWatchLogsSourceUrl
-            o: !Ref Section7cAutoSubscribeLogGroupsOptions
-            p: !Ref Section7dAutoSubscribeLogGroupPattern
-            q: !Ref Section7eAutoSubscribeLogGroupByTags
-            r: !Ref Section9aAutoEnableS3LogsELBResourcesOptions
-            s: !Ref Section9bELBCreateLogSource
-            t: !Ref Section9cELBLogsSourceUrl
-            u: !Ref Section9dELBS3LogsBucketName
-            v: !Ref Section10aAppInstallLocation
-            w: !FindInMap [CommonData, NestedTemplate, Version]
+            f: !Ref Section4dAWSMetricsTagFilters
+            g: !Ref Section5aAutoEnableS3LogsALBResourcesOptions
+            h: !Ref Section5bALBCreateLogSource
+            i: !Ref Section5cALBLogsSourceUrl
+            j: !Ref Section5dALBS3LogsBucketName
+            k: !Ref Section6aCreateCloudTrailLogSource
+            l: !Ref Section6bCloudTrailLogsSourceUrl
+            m: !Ref Section6cCloudTrailLogsBucketName
+            n: !Ref Section7aLambdaCreateCloudWatchLogsSourceOptions
+            o: !Ref Section7bLambdaCloudWatchLogsSourceUrl
+            p: !Ref Section7cAutoSubscribeLogGroupsOptions
+            q: !Ref Section7dAutoSubscribeLogGroupPattern
+            r: !Ref Section7eAutoSubscribeLogGroupByTags
+            s: !Ref Section9aAutoEnableS3LogsELBResourcesOptions
+            t: !Ref Section9bELBCreateLogSource
+            u: !Ref Section9cELBLogsSourceUrl
+            v: !Ref Section9dELBS3LogsBucketName
+            w: !Ref Section10aAppInstallLocation
+            x: !FindInMap [CommonData, NestedTemplate, Version]
 
   CreateCommonResources:
     Type: AWS::CloudFormation::Stack
@@ -682,6 +691,7 @@ Resources:
         CloudWatchMetricsSourceName: !Sub "cloudwatch-metrics-${AWS::Region}"
         CloudWatchMetricsNameSpaces: !Ref Section4bMetricsNameSpaces
         CloudWatchMetricSourceCategory: !FindInMap [CommonData, CollectorDetails, CloudWatchMetricSourceCategory]
+        MetricsSourceAWSTagFilters: !Ref Section4dAWSMetricsTagFilters
         ScanInterval: 300000
         CreateKinesisFirehoseMetricsSource: !If [ create_kf_metrics_source, "Yes", "No" ]
         KinesisFirehoseMetricsSourceName: !Sub "cloudwatch-metrics-${AWS::Region}"
diff --git a/aws-observability/templates/sumologic_observability.mp.test.yaml b/aws-observability/templates/sumologic_observability.mp.test.yaml
index f6debc35..0efa50da 100755
--- a/aws-observability/templates/sumologic_observability.mp.test.yaml
+++ b/aws-observability/templates/sumologic_observability.mp.test.yaml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: "Version - v2.10.0. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will automate the setup of the AWS Observability Solution. For more information on each parameter, please see the AWS Observability Setup Guide: https://help.sumologic.com/Observability_Solution/AWS_Observability_Solution/01_Deploy_and_Use_AWS_Observability/05_Deploy_AWS_Observability"
+Description: "Version - v2.11.0. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will automate the setup of the AWS Observability Solution. For more information on each parameter, please see the AWS Observability Setup Guide: https://help.sumologic.com/Observability_Solution/AWS_Observability_Solution/01_Deploy_and_Use_AWS_Observability/05_Deploy_AWS_Observability"
 
 Metadata:
   'AWS::CloudFormation::Interface':
@@ -31,6 +31,7 @@ Metadata:
           - Section4aCreateMetricsSourceOptions
           - Section4bMetricsNameSpaces
           - Section4cCloudWatchExistingSourceAPIUrl
+          - Section4dAWSMetricsTagFilters
 
       - Label:
           default: "5. Sumo Logic AWS ALB Log Source"
@@ -105,6 +106,8 @@ Metadata:
         default: "Sumo Logic AWS Metrics Namespaces"
       Section4cCloudWatchExistingSourceAPIUrl:
         default: "Existing Sumo Logic Metrics Source API URL"
+      Section4dAWSMetricsTagFilters:
+        default: "Sumo Logic AWS Metrics Tag Filters"
 
       Section5aAutoEnableS3LogsALBResourcesOptions:
         default: "Enable ALB Access logging"
@@ -240,6 +243,10 @@ Parameters:
     Type: String
     Description: "Required when already collecting CloudWatch Metrics. Provide the existing Sumo Logic Metrics Source API URL. Account Field will be added to the Source. For Source API URL, visit https://help.sumologic.com/03Send-Data/Sources/03Use-JSON-to-Configure-Sources/Local-Configuration-File-Management/View-or-Download-Source-JSON-Configuration"
     Default: ""
+  Section4dAWSMetricsTagFilters:
+    Type: String
+    AllowedPattern: '^\{.*\}$'
+    Description: "Provide JSON format of the namespaces with it's tags values to add filters to your metrics. Use semicolons to separate multiple values for the same tag key. AWS Tag Filters will be added to the Source. For JSON format sample, visit <#TODO>"
 
   Section5aAutoEnableS3LogsALBResourcesOptions:
     Type: String
@@ -500,7 +507,7 @@ Mappings:
   CommonData:
     NestedTemplate:
       BucketName: "sumologic-appdev-aws-sam-apps"
-      Version: "v2.10.0"
+      Version: "v2.11.0"
     CollectorDetails:
       SumoLogicAccountID: 246946804217
       CollectorNamePrefix: "aws-observability"
@@ -687,6 +694,7 @@ Resources:
         CloudWatchMetricsSourceName: !Sub "cloudwatch-metrics-${AWS::Region}"
         CloudWatchMetricsNameSpaces: !Ref Section4bMetricsNameSpaces
         CloudWatchMetricSourceCategory: !FindInMap [CommonData, CollectorDetails, CloudWatchMetricSourceCategory]
+        MetricsSourceAWSTagFilters: !Ref Section4dAWSMetricsTagFilters
         ScanInterval: 300000
         CreateKinesisFirehoseMetricsSource: !If [ create_kf_metrics_source, "Yes", "No" ]
         KinesisFirehoseMetricsSourceName: !Sub "cloudwatch-metrics-${AWS::Region}"
diff --git a/aws-observability/templates/sumologic_observability.mp.yaml b/aws-observability/templates/sumologic_observability.mp.yaml
index 37c86f5b..8e56e17b 100755
--- a/aws-observability/templates/sumologic_observability.mp.yaml
+++ b/aws-observability/templates/sumologic_observability.mp.yaml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: "Version - v2.10.0. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will automate the setup of the AWS Observability Solution. For more information on each parameter, please see the AWS Observability Setup Guide: https://help.sumologic.com/Observability_Solution/AWS_Observability_Solution/01_Deploy_and_Use_AWS_Observability/05_Deploy_AWS_Observability"
+Description: "Version - v2.11.0. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will automate the setup of the AWS Observability Solution. For more information on each parameter, please see the AWS Observability Setup Guide: https://help.sumologic.com/Observability_Solution/AWS_Observability_Solution/01_Deploy_and_Use_AWS_Observability/05_Deploy_AWS_Observability"
 
 Metadata:
   'AWS::CloudFormation::Interface':
@@ -31,6 +31,7 @@ Metadata:
           - Section4aCreateMetricsSourceOptions
           - Section4bMetricsNameSpaces
           - Section4cCloudWatchExistingSourceAPIUrl
+          - Section4dAWSMetricsTagFilters
 
       - Label:
           default: "5. Sumo Logic AWS ALB Log Source"
@@ -105,6 +106,8 @@ Metadata:
         default: "Sumo Logic AWS Metrics Namespaces"
       Section4cCloudWatchExistingSourceAPIUrl:
         default: "Existing Sumo Logic Metrics Source API URL"
+      Section4dAWSMetricsTagFilters:
+        default: "Sumo Logic AWS Metrics Tag Filters"
 
       Section5aAutoEnableS3LogsALBResourcesOptions:
         default: "Enable ALB Access logging"
@@ -238,6 +241,10 @@ Parameters:
     Type: String
     Description: "Required when already collecting CloudWatch Metrics. Provide the existing Sumo Logic Metrics Source API URL. Account Field will be added to the Source. For Source API URL, visit https://help.sumologic.com/03Send-Data/Sources/03Use-JSON-to-Configure-Sources/Local-Configuration-File-Management/View-or-Download-Source-JSON-Configuration"
     Default: ""
+  Section4dAWSMetricsTagFilters:
+    Type: String
+    AllowedPattern: '^\{.*\}$'
+    Description: "Provide JSON format of the namespaces with it's tags values to add filters to your metrics. Use semicolons to separate multiple values for the same tag key. AWS Tag Filters will be added to the Source. For JSON format sample, visit <#TODO>"
 
   Section5aAutoEnableS3LogsALBResourcesOptions:
     Type: String
@@ -498,7 +505,7 @@ Mappings:
   CommonData:
     NestedTemplate:
       BucketName: "sumologic-appdev-aws-sam-apps"
-      Version: "v2.10.0"
+      Version: "v2.11.0"
     CollectorDetails:
       SumoLogicAccountID: 926226587429
       CollectorNamePrefix: "aws-observability"
@@ -685,6 +692,7 @@ Resources:
         CloudWatchMetricsSourceName: !Sub "cloudwatch-metrics-${AWS::Region}"
         CloudWatchMetricsNameSpaces: !Ref Section4bMetricsNameSpaces
         CloudWatchMetricSourceCategory: !FindInMap [CommonData, CollectorDetails, CloudWatchMetricSourceCategory]
+        MetricsSourceAWSTagFilters: !Ref Section4dAWSMetricsTagFilters
         ScanInterval: 300000
         CreateKinesisFirehoseMetricsSource: !If [ create_kf_metrics_source, "Yes", "No" ]
         KinesisFirehoseMetricsSourceName: !Sub "cloudwatch-metrics-${AWS::Region}"