diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ab432c0..5b9465e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -22,4 +22,5 @@ jobs:
           mkdir build
           yq ".Resources.LogsLambda.Properties.Code.ZipFile = \"$(sed  's/\"/\\\"/g' ./handler.py)\""  axiom-cloudwatch-lambda-cloudformation-stack.template.yaml > build/axiom-cloudwatch-lambda-cloudformation-stack.yaml
           yq ".Resources.BackfillerLambda.Properties.Code.ZipFile = \"$(sed  's/\"/\\\"/g' ./backfill.py)\""  axiom-cloudwatch-backfiller-lambda-cloudformation-stack.template.yaml > build/axiom-cloudwatch-backfiller-lambda-cloudformation-stack.yaml
+          yq ".Resources.AxiomCloudWatchLogsSubscriber.Properties.Code.ZipFile = \"$(sed  's/\"/\\\"/g' ./logs_subscriber.py)\""  axiom-cloudwatch-logs-subscriber-cloudformation-stack.template.yaml > build/axiom-cloudwatch-logs-subscriber-cloudformation-stack.yaml
       - run: cat build/*
diff --git a/axiom-cloudwatch-log-subscriber-cloudformation-stack.template.yaml b/axiom-cloudwatch-log-subscriber-cloudformation-stack.template.yaml
new file mode 100644
index 0000000..3dfebcc
--- /dev/null
+++ b/axiom-cloudwatch-log-subscriber-cloudformation-stack.template.yaml
@@ -0,0 +1,139 @@
+Parameters:
+  LambdaFunctionName:
+    Type: String
+    Description: Name of the AWS Lambda Function.
+    Default: axiom-cloudwatch-logs-subscriber-lambda
+    AllowedPattern: ".+" # required
+  AxiomCloudWatchLambdaIngesterARN:
+    Type: String
+    Description: The ARN of the AWS Lambda Function that is used to ingest data to axiom.
+    AllowedPattern: ".+" # required
+  CloudWatchLogGroupsPrefix:
+    Type: String
+    Description: The Prefix of cloudwatch log groups to subscribe to the AWS Lambda ingester.
+    Default: "" # all
+Resources:
+  # AxiomCloudWatchLogsSubscriberS3Bucket:
+  #   Type: AWS::S3::Bucket
+  #   Properties:
+  #     AccessControl: BucketOwnerFullControl
+  #     BucketName: !Join [ "-", [ !Ref AWS::StackName, "axiom", "cloudtrail" ] ]
+  # AxiomCloudWatchLogsSubscriberS3BucketPolicy:
+  #   DependsOn: AxiomCloudWatchLogsSubscriberS3Bucket
+  #   Type: AWS::S3::BucketPolicy
+  #   Properties:
+  #     Bucket: !Ref AxiomCloudWatchLogsSubscriberS3Bucket
+  #     PolicyDocument:
+  #       {
+  #         "Version" : "2012-10-17",
+  #         "Statement" : [
+  #           {
+  #             "Sid" : "AWSCloudTrailAclCheck20150319",
+  #             "Effect" : "Allow",
+  #             "Principal" : {
+  #               "Service" : "cloudtrail.amazonaws.com"
+  #             },
+  #             "Action" : "s3:GetBucketAcl",
+  #             "Resource" : {
+  #               "Fn::GetAtt" : [ "AxiomCloudWatchLogsSubscriberS3Bucket", "Arn" ]
+  #             }
+  #           },
+  #           {
+  #             "Sid" : "AWSCloudTrailWrite20150319",
+  #             "Effect" : "Allow",
+  #             "Principal" : {
+  #               "Service" : "cloudtrail.amazonaws.com"
+  #             },
+  #             "Action" : "s3:PutObject",
+  #             "Resource" : {
+  #               "Fn::Join" : [ "", [ { "Fn::GetAtt" : [ "AxiomCloudWatchLogsSubscriberS3Bucket", "Arn" ] }, "/AWSLogs/", { "Ref" : "AWS::AccountId" }, "/*" ] ]
+  #             },
+  #             "Condition" : {
+  #               "StringEquals" : { "s3:x-amz-acl" : "bucket-owner-full-control" }
+  #             }
+  #           }
+  #         ]
+  #       }
+  AxiomLogsSubscriberCloudTrail:
+    Type: AWS::CloudTrail::Trail
+    # DependsOn: AxiomCloudWatchLogsSubscriberS3BucketPolicy
+    Properties:
+      EnableLogFileValidation: false
+      IncludeGlobalServiceEvents: false
+      IsMultiRegionTrail: true
+      IsLogging: true
+      S3BucketName: !Join ["-", [!Ref AWS::StackName, "axiom", "cloudtrail"]]
+      TrailName:
+        !Join ["-", [!Ref AWS::StackName, "axiom", { "Ref": "AWS::AccountId" }]]
+  AxiomLogsSubscriberEventRule:
+    DependsOn: AxiomCloudWatchLogsSubscriber
+    Type: AWS::Events::Rule
+    Properties:
+      Description: Axiom log group auto subscription event rule.,
+      EventPattern:
+        source: ["aws.logs"]
+        detail-type: ["AWS API Call via CloudTrail"]
+        detail:
+          eventSource: ["logs.amazonaws.com"]
+          eventName: ["CreateLogGroup"]
+      Name:
+        "Fn::Join":
+          ["-", [{ "Ref": "AWS::StackName" }, "axiom-auto-subscription-rule"]]
+      Targets:
+        - {
+            Id:
+              {
+                !Join [
+                  "-",
+                  [!Ref "AWS::StackName", "axiom-auto-subscription-rule"],
+                ],
+              },
+            Arn: { !GetAtt ["AxiomCloudWatchLogsSubscriber", "Arn"] },
+          }
+  AxiomCloudWatchLogsSubscriberPolicy:
+    Type: AWS::IAM::Policy
+    Properties:
+      PolicyDocument:
+        Statement:
+          - Action:
+              - logs:DeleteSubscriptionFilter
+              - logs:PutSubscriptionFilter
+              - logs:DescribeLogGroups
+              - lambda:AddPermission
+              - lambda:RemovePermission
+            Effect: Allow
+            Resource: "*"
+      PolicyName: axiom-cloudwatch-backfiller-lambda-policy
+      Roles:
+        - !Ref "AxiomCloudWatchLogsSubscriberRole"
+  AxiomCloudWatchLogsSubscriberRole:
+    Type: AWS::IAM::Role
+    Properties:
+      AssumeRolePolicyDocument:
+        Statement:
+          - Action:
+              - "sts:AssumeRole"
+            Effect: Allow
+            Principal:
+              Service:
+                - lambda.amazonaws.com
+      ManagedPolicyArns:
+        - "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+  AxiomCloudWatchLogsSubscriber:
+    Type: AWS::Lambda::Function
+    DependsOn:
+      - AxiomCloudWatchLogsSubscriberRole
+    Properties:
+      Runtime: python3.9
+      Handler: index.lambda_handler
+      Code:
+        ZipFile: |
+          # DO NOT EDIT
+          # CI will replace these comments with the code from ./logs_subscriber.py
+      Role: !GetAtt
+        - AxiomCloudWatchLogsSubscriberRole
+        - Arn
+      Environment:
+        Variables:
+          AXIOM_CLOUDWATCH_LAMBDA_INGESTER_ARN: !Ref "AxiomCloudWatchLambdaIngesterARN"
+          LOG_GROUP_PREFIX: !Ref "CloudWatchLogGroupsPrefix"
diff --git a/logs_subscriber.py b/logs_subscriber.py
new file mode 100644
index 0000000..39f0dff
--- /dev/null
+++ b/logs_subscriber.py
@@ -0,0 +1,39 @@
+# subscribe the Axiom ingester to newly created log groups
+import boto3
+import os
+import helpers
+
+# Set environment variables.
+axiom_cloudwatch_lambda_ingester_arn = os.getenv("AXIOM_CLOUDWATCH_LAMBDA_INGESTER_ARN")
+log_group_prefix = os.getenv("LOG_GROUP_PREFIX", "")
+
+# Set up CloudWatch Logs client.
+log_client = boto3.client("logs")
+
+
+def lambda_handler(event, context):
+    """
+    Subscribes log ingester to log group from event.
+
+    :param event: Event data from CloudWatch Logs.
+    :type event: dict
+
+    :param context: Lambda context object.
+    :type context: obj
+
+    :return: None
+    """
+    # Grab the log group name from incoming event.
+    log_group_name = event["detail"]["requestParameters"]["logGroupName"]
+  
+    # Check whether the prefix is set - the prefix is used to determine which logs we want.
+    if not log_group_prefix:
+        helpers.create_subscription(
+            log_client, log_group_name, axiom_cloudwatch_lambda_ingester_arn, context
+        )
+
+        # Check whether the log group's name starts with the set prefix.
+    elif log_group_name.startswith(log_group_prefix):
+            helpers.create_subscription(
+                log_client, log_group_name, axiom_cloudwatch_lambda_ingester_arn, context
+            )
\ No newline at end of file