diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..e5e77ca
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,44 @@
+# Main Test
+name: Main Test
+
+on:
+  push:
+    branches: [ develop ]
+  pull_request:
+    branches: [ develop ]
+  schedule:
+    - cron: '12 19 * * 1' # run Mondays at 12:12pm pacific
+
+jobs:
+  taskcat:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - name: install
+        run: make update-common
+      - name: build
+        run: make build
+      - name: test
+        run: make test-main
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.OE_PATTERNS_TASKCAT_DEV_GITHUB_AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.OE_PATTERNS_TASKCAT_DEV_GITHUB_AWS_SECRET_ACCESS_KEY }}
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: taskcat_outputs
+          path: test/main-test/taskcat_outputs/
+      - name: clean snapshots
+        if: always()
+        run: make clean-snapshots-tcat
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.OE_PATTERNS_TASKCAT_DEV_GITHUB_AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.OE_PATTERNS_TASKCAT_DEV_GITHUB_AWS_SECRET_ACCESS_KEY }}
+      - name: clean logs
+        if: always()
+        run: make clean-logs-tcat
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.OE_PATTERNS_TASKCAT_DEV_GITHUB_AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.OE_PATTERNS_TASKCAT_DEV_GITHUB_AWS_SECRET_ACCESS_KEY }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfc242b..d477910 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Unreleased
 
+* Adding TaskCat tests
+* Upgrade OE Common Constructs to 4.1.4
+
 # 2.1.0
 
 * Upgrade Mastodon to 4.3.1
diff --git a/cdk/mastodon/mastodon_stack.py b/cdk/mastodon/mastodon_stack.py
index 750629d..118f8d7 100644
--- a/cdk/mastodon/mastodon_stack.py
+++ b/cdk/mastodon/mastodon_stack.py
@@ -34,8 +34,8 @@
 # AMI list generated by:
 # make TEMPLATE_VERSION=2.1.0 ami-ec2-build
 # on Tue Oct 29 00:14:28 UTC 2024.
-AMI_ID="ami-0a290138ef4defcda"
-AMI_NAME="ordinary-experts-patterns-mastodon-2.1.0-20241028-1153"
+AMI_ID="ami-0abe6a5d5863f852b"
+AMI_NAME="ordinary-experts-patterns-mastodon-2.1.0-1-g42b7b16-20241121-1025"
 generated_ami_ids = {
     "af-south-1": "ami-XXXXXXXXXXXXXXXXX",
     "ap-east-1": "ami-XXXXXXXXXXXXXXXXX",
@@ -61,7 +61,7 @@
     "us-east-2": "ami-XXXXXXXXXXXXXXXXX",
     "us-west-1": "ami-XXXXXXXXXXXXXXXXX",
     "us-west-2": "ami-XXXXXXXXXXXXXXXXX",
-    "us-east-1": "ami-0a290138ef4defcda"
+    "us-east-1": "ami-0abe6a5d5863f852b"
 }
 # End generated code block.
 
diff --git a/cdk/setup.py b/cdk/setup.py
index 90b93ee..6fe5010 100644
--- a/cdk/setup.py
+++ b/cdk/setup.py
@@ -21,7 +21,7 @@
     install_requires=[
         f"aws-cdk-lib=={CDK_VERSION}",
         f"constructs>=10.0.0,<11.0.0",
-        f"oe-patterns-cdk-common@git+https://github.com/ordinaryexperts/aws-marketplace-oe-patterns-cdk-common@4.1.0"
+        f"oe-patterns-cdk-common@git+https://github.com/ordinaryexperts/aws-marketplace-oe-patterns-cdk-common@4.1.4"
     ],
 
     python_requires=">=3.6",
diff --git a/test/main-test/.taskcat.yml b/test/main-test/.taskcat.yml
new file mode 100644
index 0000000..cccc1c5
--- /dev/null
+++ b/test/main-test/.taskcat.yml
@@ -0,0 +1,21 @@
+general:
+  s3_bucket: github-user-and-bucket-taskcatbucket-2zppaw3wi3sx
+project:
+  name: oe-patterns-mastodon
+  regions:
+  - us-east-1
+  template: ./template.yaml
+tests:
+  allResources:
+    parameters:
+      AlbCertificateArn: arn:aws:acm:us-east-1:992593896645:certificate/943928d7-bfce-469c-b1bf-11561024580e
+      AlbIngressCidr: 0.0.0.0/0
+      DnsHostname: "oe-patterns-mastodon-taskcat-$[taskcat_random-string].dev.patterns.ordinaryexperts.com"
+      DnsRoute53HostedZoneName: dev.patterns.ordinaryexperts.com
+      PipelineArtifactBucketName: github-user-and-bucket-taskcatbucket-2zppaw3wi3sx
+      SesCreateDomainIdentity: "false"
+      VpcId: vpc-00425deda4c835455
+      VpcPrivateSubnet1Id: subnet-030c94b9795c6cb96
+      VpcPrivateSubnet2Id: subnet-079290412ce63c4d5
+      VpcPublicSubnet1Id: subnet-0c2f5d4daa1792c8d
+      VpcPublicSubnet2Id: subnet-060c39a6ded9e89d7