diff --git a/.github/workflows/cfn-lint.yml b/.github/workflows/cfn-lint.yml
new file mode 100644
index 000000000..b529609cd
--- /dev/null
+++ b/.github/workflows/cfn-lint.yml
@@ -0,0 +1,16 @@
+name: cfn-lint
+
+on: [pull_request]
+
+jobs:
+  cfn-lint:
+    runs-on: ubuntu-latest
+    
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: cfn-lint
+      uses: docker://scottbrenner/cfn-lint-action:latest
+      with:
+        args: "aws/logs_monitoring/template.yaml"
\ No newline at end of file
diff --git a/.github/workflows/lambdachecks.yml b/.github/workflows/lambdachecks.yml
index fc363add9..d7a286fa3 100644
--- a/.github/workflows/lambdachecks.yml
+++ b/.github/workflows/lambdachecks.yml
@@ -1,6 +1,6 @@
 name: Lambda checks
 
-on: [push]
+on: [pull_request]
 
 jobs:
   build:
diff --git a/aws/logs_monitoring/tests/snapshots/cloudwatch_log.json~snapshot b/aws/logs_monitoring/tests/snapshots/cloudwatch_log.json~snapshot
index 459790ae3..08e134638 100644
--- a/aws/logs_monitoring/tests/snapshots/cloudwatch_log.json~snapshot
+++ b/aws/logs_monitoring/tests/snapshots/cloudwatch_log.json~snapshot
@@ -19,7 +19,7 @@
             "invoked_function_arn": "arn:aws:lambda:us-east-1:0:function:test"
           },
           "ddsourcecategory": "aws",
-          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0",
+          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.4.0",
           "ddsource": "cloudwatch",
           "service": "cloudwatch",
           "host": "testLogGroup"
@@ -38,7 +38,7 @@
             "invoked_function_arn": "arn:aws:lambda:us-east-1:0:function:test"
           },
           "ddsourcecategory": "aws",
-          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0",
+          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.4.0",
           "ddsource": "cloudwatch",
           "service": "cloudwatch",
           "host": "testLogGroup"
diff --git a/aws/logs_monitoring/tests/snapshots/cloudwatch_log_lambda_invocation.json~snapshot b/aws/logs_monitoring/tests/snapshots/cloudwatch_log_lambda_invocation.json~snapshot
index 0329e5f9b..eebd7de63 100644
--- a/aws/logs_monitoring/tests/snapshots/cloudwatch_log_lambda_invocation.json~snapshot
+++ b/aws/logs_monitoring/tests/snapshots/cloudwatch_log_lambda_invocation.json~snapshot
@@ -22,7 +22,7 @@
             "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
           },
           "ddsourcecategory": "aws",
-          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
+          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.4.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
           "ddsource": "lambda",
           "service": "hello-dog-node-dev-hello12x",
           "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
@@ -44,7 +44,7 @@
             "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
           },
           "ddsourcecategory": "aws",
-          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
+          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.4.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
           "ddsource": "lambda",
           "service": "hello-dog-node-dev-hello12x",
           "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
@@ -66,7 +66,7 @@
             "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
           },
           "ddsourcecategory": "aws",
-          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
+          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.4.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
           "ddsource": "lambda",
           "service": "hello-dog-node-dev-hello12x",
           "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
@@ -88,7 +88,7 @@
             "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
           },
           "ddsourcecategory": "aws",
-          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
+          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.4.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
           "ddsource": "lambda",
           "service": "hello-dog-node-dev-hello12x",
           "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
@@ -110,7 +110,7 @@
             "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
           },
           "ddsourcecategory": "aws",
-          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
+          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.4.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
           "ddsource": "lambda",
           "service": "hello-dog-node-dev-hello12x",
           "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
@@ -132,7 +132,7 @@
             "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
           },
           "ddsourcecategory": "aws",
-          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
+          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.4.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
           "ddsource": "lambda",
           "service": "hello-dog-node-dev-hello12x",
           "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
@@ -154,7 +154,7 @@
             "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
           },
           "ddsourcecategory": "aws",
-          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
+          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.4.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
           "ddsource": "lambda",
           "service": "hello-dog-node-dev-hello12x",
           "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
@@ -176,7 +176,7 @@
             "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
           },
           "ddsourcecategory": "aws",
-          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
+          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.4.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
           "ddsource": "lambda",
           "service": "hello-dog-node-dev-hello12x",
           "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
@@ -198,7 +198,7 @@
             "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
           },
           "ddsourcecategory": "aws",
-          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
+          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.4.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
           "ddsource": "lambda",
           "service": "hello-dog-node-dev-hello12x",
           "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
@@ -220,7 +220,7 @@
             "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
           },
           "ddsourcecategory": "aws",
-          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
+          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.4.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
           "ddsource": "lambda",
           "service": "hello-dog-node-dev-hello12x",
           "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
@@ -242,7 +242,7 @@
             "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
           },
           "ddsourcecategory": "aws",
-          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
+          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.4.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
           "ddsource": "lambda",
           "service": "hello-dog-node-dev-hello12x",
           "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
@@ -264,7 +264,7 @@
             "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
           },
           "ddsourcecategory": "aws",
-          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
+          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.4.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
           "ddsource": "lambda",
           "service": "hello-dog-node-dev-hello12x",
           "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
@@ -286,7 +286,7 @@
             "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
           },
           "ddsourcecategory": "aws",
-          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
+          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.4.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
           "ddsource": "lambda",
           "service": "hello-dog-node-dev-hello12x",
           "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
@@ -308,7 +308,7 @@
             "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
           },
           "ddsourcecategory": "aws",
-          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
+          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.4.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
           "ddsource": "lambda",
           "service": "hello-dog-node-dev-hello12x",
           "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
@@ -330,7 +330,7 @@
             "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
           },
           "ddsourcecategory": "aws",
-          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
+          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.4.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
           "ddsource": "lambda",
           "service": "hello-dog-node-dev-hello12x",
           "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
@@ -352,7 +352,7 @@
             "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"
           },
           "ddsourcecategory": "aws",
-          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.3.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
+          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:3.4.0,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1",
           "ddsource": "lambda",
           "service": "hello-dog-node-dev-hello12x",
           "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x"