diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 41c1baad..bed3c967 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,14 @@
 # Use this file to define individuals or teams that are responsible for code in a repository.
 # Read more: <https://help.github.com/articles/about-codeowners/>
+#
+# Order is important: the last matching pattern takes the most precedence
 
-* @cloudposse/engineering
\ No newline at end of file
+# These owners will be the default owners for everything
+*             @cloudposse/engineering @cloudposse/contributors
+
+# Cloud Posse must review any changes to Makefiles
+**/Makefile   @cloudposse/engineering
+**/Makefile.* @cloudposse/engineering
+
+# Cloud Posse must review any changes to GitHub actions
+.github/*     @cloudposse/engineering
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index ecc9eb62..39a8686f 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-Have a question? Please checkout our [Slack Community](https://slack.cloudposse.com) in the `#geodesic` channel or visit our [Slack Archive](https://archive.sweetops.com/geodesic/). 
+Have a question? Please checkout our [Slack Community](https://slack.cloudposse.com) or visit our [Slack Archive](https://archive.sweetops.com/). 
 
 [![Slack Community](https://slack.cloudposse.com/badge.svg)](https://slack.cloudposse.com)
 
@@ -33,4 +33,4 @@ Explain what alternative solutions or features you've considered.
 
 ## Additional Context
 
-Add any other context or screenshots about the feature request here.
\ No newline at end of file
+Add any other context or screenshots about the feature request here.
diff --git a/.github/workflows/chatops.yml b/.github/workflows/chatops.yml
new file mode 100644
index 00000000..a6bb11b4
--- /dev/null
+++ b/.github/workflows/chatops.yml
@@ -0,0 +1,37 @@
+name: chatops
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  default:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: "Handle common commands"
+        uses: cloudposse/actions/github/slash-command-dispatch@0.15.0
+        with:
+          token: ${{ secrets.PUBLIC_REPO_ACCESS_TOKEN }}
+          reaction-token: ${{ secrets.GITHUB_TOKEN }}
+          repository: cloudposse/actions
+          commands: rebuild-readme, terraform-fmt
+          permission: none
+          issue-type: pull-request
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout commit"
+        uses: actions/checkout@v2
+      - name: "Run tests"
+        uses: cloudposse/actions/github/slash-command-dispatch@0.15.0
+        with:
+          token: ${{ secrets.PUBLIC_REPO_ACCESS_TOKEN }}
+          reaction-token: ${{ secrets.GITHUB_TOKEN }}
+          repository: cloudposse/actions
+          commands: test
+          permission: none
+          issue-type: pull-request
+          reactions: false
+
+
diff --git a/.github/workflows/slash-command-dispatch.yml b/.github/workflows/slash-command-dispatch.yml
deleted file mode 100644
index 3e3c1387..00000000
--- a/.github/workflows/slash-command-dispatch.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Slash Command Dispatch
-on:
-  issue_comment:
-    types: [created]
-
-jobs:
-  slashCommandDispatch:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Slash Command Dispatch
-        uses: cloudposse/actions/github/slash-command-dispatch@0.12.0
-        with:
-          token: ${{ secrets.GITHUB_BOT_TOKEN }}
-          reaction-token: ${{ secrets.GITHUB_TOKEN }}
-          repository: cloudposse/actions
-          commands: rebuild-readme, terraform-fmt
-          permission: none
-          issue-type: pull-request
diff --git a/codefresh/test.yml b/codefresh/test.yml
deleted file mode 100644
index ddd07f97..00000000
--- a/codefresh/test.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-version: '1.0'
-
-stages:
-  - Prepare
-  - Test
-
-steps:
-  wait:
-    title: Wait
-    stage: Prepare
-    image: codefresh/cli:latest
-    commands:
-      - codefresh get builds --pipeline=${{CF_REPO_NAME}} --status running --limit 1000 -o json | jq --arg id ${{CF_BUILD_ID}} -ser 'flatten|.[-1].id==$id'
-    retry:
-      maxAttempts: 10
-      delay: 20
-      exponentialFactor: 1.1
-
-  main_clone:
-    title: "Clone repository"
-    type: git-clone
-    stage: Prepare
-    description: "Initialize"
-    repo: ${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}
-    git: CF-default
-    revision: ${{CF_REVISION}}
-
-  clean_init:
-    title: Prepare build-harness and test-harness
-    image: ${{TEST_IMAGE}}
-    stage: Prepare
-    commands:
-      - cf_export PATH="/usr/local/terraform/0.12/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-      - make init
-      - git -C build-harness checkout master
-      - make -C test/ clean init TEST_HARNESS_BRANCH=master
-      - make -C test/src clean init
-      - find . -type d -name '.terraform' | xargs rm -rf
-      - find . -type f -name 'terraform.tfstate*' -exec rm -f {} \;
-
-  test:
-    type: "parallel"
-    title: "Run tests"
-    description: "Run all tests in parallel"
-    stage: Test
-    steps:
-      test_readme_lint:
-        title: "Test README.md updated"
-        stage: "Test"
-        image: ${{TEST_IMAGE}}
-        description: Test "readme/lint"
-        commands:
-          - make readme/lint
-
-      test_module:
-        title: Test module with bats
-        image: ${{TEST_IMAGE}}
-        stage: Test
-        commands:
-          - make -C test/ module
-
-      test_examples_complete:
-        title: Test "examples/complete" with bats
-        image: ${{TEST_IMAGE}}
-        stage: Test
-        commands:
-          - make -C test/ examples/complete
-
-      test_examples_complete_terratest:
-        title: Test "examples/complete" with terratest
-        image: ${{TEST_IMAGE}}
-        stage: Test
-        commands:
-          - make -C test/src