diff --git a/.github/workflows/release-branch.yml b/.github/workflows/branch.yml
similarity index 52%
rename from .github/workflows/release-branch.yml
rename to .github/workflows/branch.yml
index 852d5e3e..fd64cd85 100644
--- a/.github/workflows/release-branch.yml
+++ b/.github/workflows/branch.yml
@@ -1,6 +1,11 @@
 ---
-name: release-branch
+name: Branch
 on:
+  pull_request:
+    branches:
+      - main
+      - release/**
+    types: [opened, synchronize, reopened, labeled, unlabeled]
   push:
     branches:
       - main
@@ -16,5 +21,5 @@ permissions: {}
 
 jobs:
   terraform-module:
-    uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/release-branch.yml@main
+    uses: cloudposse/.github/.github/workflows/shared-terraform-module.yml@main
     secrets: inherit
diff --git a/.github/workflows/feature-branch-chatops.yml b/.github/workflows/chatops.yml
similarity index 60%
rename from .github/workflows/feature-branch-chatops.yml
rename to .github/workflows/chatops.yml
index 9abfc612..c3d47fa6 100644
--- a/.github/workflows/feature-branch-chatops.yml
+++ b/.github/workflows/chatops.yml
@@ -1,5 +1,5 @@
 ---
-name: feature-branch-chatops
+name: chatops
 on:
   issue_comment:
     types: [created]
@@ -11,6 +11,6 @@ permissions:
 
 jobs:
   terraform-module:
-    uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/feature-branch-chatops.yml@main
+    uses: cloudposse/.github/.github/workflows/shared-terraform-chatops.yml@main
     secrets:
       github_access_token: ${{ secrets.REPO_ACCESS_TOKEN }}
diff --git a/.github/workflows/feature-branch.yml b/.github/workflows/feature-branch.yml
deleted file mode 100644
index ebd8854f..00000000
--- a/.github/workflows/feature-branch.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: feature-branch
-on:
-  pull_request:
-    branches:
-      - main
-      - release/**
-    types: [opened, synchronize, reopened, labeled, unlabeled]
-
-permissions:
-  pull-requests: write
-  id-token: write
-  contents: write
-  issues: write
-
-jobs:
-  terraform-module:
-    uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/feature-branch.yml@main
-    secrets: inherit
diff --git a/.github/workflows/release-published.yml b/.github/workflows/release-published.yml
deleted file mode 100644
index 1b0aaca7..00000000
--- a/.github/workflows/release-published.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: release-published
-on:
-  release:
-    types:
-      - published
-
-permissions: {}
-
-jobs:
-  terraform-module:
-    uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/release-published.yml@main
-    secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000..f9680681
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,13 @@
+---
+name: release
+on:
+  release:
+    types:
+      - published
+
+permissions: {}
+
+jobs:
+  terraform-module:
+    uses: cloudposse/.github/.github/workflows/shared-release-branches.yml@main
+    secrets: inherit
diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
index 7bc09ab9..a79e9498 100644
--- a/.github/workflows/scheduled.yml
+++ b/.github/workflows/scheduled.yml
@@ -12,5 +12,5 @@ permissions:
 
 jobs:
   scheduled:
-    uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/scheduled.yml@main
+    uses: cloudposse/.github/.github/workflows/shared-terraform-scheduled.yml@main
     secrets: inherit